diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-12-03 10:47:53 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-12-03 10:47:53 +0100 |
commit | df60673198ae678f68af54873b8904ba93fe13a0 (patch) | |
tree | 6e9a3393d0be7b68a69c2bbc58f4325ceb6fd853 /fs/fscache/object.c | |
parent | x86/headers: Fix -Wmissing-prototypes warning (diff) | |
parent | Linux 4.20-rc5 (diff) | |
download | linux-df60673198ae678f68af54873b8904ba93fe13a0.tar.xz linux-df60673198ae678f68af54873b8904ba93fe13a0.zip |
Merge tag 'v4.20-rc5' into x86/cleanups, to sync up the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/fscache/object.c')
-rw-r--r-- | fs/fscache/object.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/fscache/object.c b/fs/fscache/object.c index 9edc920f651f..6d9cb1719de5 100644 --- a/fs/fscache/object.c +++ b/fs/fscache/object.c @@ -730,6 +730,9 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob if (awaken) wake_up_bit(&cookie->flags, FSCACHE_COOKIE_INVALIDATING); + if (test_and_clear_bit(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags)) + wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP); + /* Prevent a race with our last child, which has to signal EV_CLEARED * before dropping our spinlock. |