diff options
| author |   Mark Brown <broonie@kernel.org> | 2016-05-03 15:09:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-03 15:09:56 +0100 |
| commit | bc0868c62bb13834b20a864f684cced1f84a2412 (patch) | |
| tree | 2c382dcd24ac95f4dbf53d238d3161d6171d8a4b /fs/cachefiles/interface.c | |
| parent | regulator: pwm: Try to avoid voltage error in duty cycle calculation (diff) | |
| parent | regulator: pwm: Use pwm_get_args() where appropriate (diff) | |
| download | wireguard-linux-bc0868c62bb13834b20a864f684cced1f84a2412.tar.xz wireguard-linux-bc0868c62bb13834b20a864f684cced1f84a2412.zip | |
Merge branch 'for-4.7/pwm-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm into regulator-pwm
Diffstat (limited to 'fs/cachefiles/interface.c')
| -rw-r--r-- | fs/cachefiles/interface.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/cachefiles/interface.c b/fs/cachefiles/interface.c index 675a3332d72f..861d611b8c05 100644 --- a/fs/cachefiles/interface.c +++ b/fs/cachefiles/interface.c @@ -291,15 +291,8 @@ static void cachefiles_drop_object(struct fscache_object *_object) } /* note that the object is now inactive */ - if (test_bit(CACHEFILES_OBJECT_ACTIVE, &object->flags)) { - write_lock(&cache->active_lock); - if (!test_and_clear_bit(CACHEFILES_OBJECT_ACTIVE, - &object->flags)) - BUG(); - rb_erase(&object->active_node, &cache->active_nodes); - wake_up_bit(&object->flags, CACHEFILES_OBJECT_ACTIVE); - write_unlock(&cache->active_lock); - } + if (test_bit(CACHEFILES_OBJECT_ACTIVE, &object->flags)) + cachefiles_mark_object_inactive(cache, object); dput(object->dentry); object->dentry = NULL; |