fscache: don't leak cookie access refs if invalidation is in progress or failed

[linux-2.6-block.git] / fs / fscache / cookie.c

diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
index 74920826d8f67467dc6d633e1820bc920b727d15..26a6d395737a60d0d543c31505bdbbb52568748b 100644 (file)
--- a/fs/fscache/cookie.c
+++ b/fs/fscache/cookie.c
@@ -739,6 +739,9 @@ again_locked:
                fallthrough;
 
        case FSCACHE_COOKIE_STATE_FAILED:
+               if (test_and_clear_bit(FSCACHE_COOKIE_DO_INVALIDATE, &cookie->flags))
+                       fscache_end_cookie_access(cookie, fscache_access_invalidate_cookie_end);
+
                if (atomic_read(&cookie->n_accesses) != 0)
                        break;
                if (test_bit(FSCACHE_COOKIE_DO_RELINQUISH, &cookie->flags)) {
@@ -1063,8 +1066,8 @@ void __fscache_invalidate(struct fscache_cookie *cookie,
                return;
 
        case FSCACHE_COOKIE_STATE_LOOKING_UP:
-               __fscache_begin_cookie_access(cookie, fscache_access_invalidate_cookie);
-               set_bit(FSCACHE_COOKIE_DO_INVALIDATE, &cookie->flags);
+               if (!test_and_set_bit(FSCACHE_COOKIE_DO_INVALIDATE, &cookie->flags))
+                       __fscache_begin_cookie_access(cookie, fscache_access_invalidate_cookie);
                fallthrough;
        case FSCACHE_COOKIE_STATE_CREATING:
                spin_unlock(&cookie->lock);