diff options
Diffstat (limited to 'fs/fscache/cookie.c')
-rw-r--r-- | fs/fscache/cookie.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c index aec01be91b0a..89acec742e0b 100644 --- a/fs/fscache/cookie.c +++ b/fs/fscache/cookie.c | |||
@@ -160,7 +160,7 @@ void __fscache_enable_cookie(struct fscache_cookie *cookie, | |||
160 | _enter("%p", cookie); | 160 | _enter("%p", cookie); |
161 | 161 | ||
162 | wait_on_bit_lock(&cookie->flags, FSCACHE_COOKIE_ENABLEMENT_LOCK, | 162 | wait_on_bit_lock(&cookie->flags, FSCACHE_COOKIE_ENABLEMENT_LOCK, |
163 | fscache_wait_bit, TASK_UNINTERRUPTIBLE); | 163 | TASK_UNINTERRUPTIBLE); |
164 | 164 | ||
165 | if (test_bit(FSCACHE_COOKIE_ENABLED, &cookie->flags)) | 165 | if (test_bit(FSCACHE_COOKIE_ENABLED, &cookie->flags)) |
166 | goto out_unlock; | 166 | goto out_unlock; |
@@ -255,7 +255,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie) | |||
255 | if (!fscache_defer_lookup) { | 255 | if (!fscache_defer_lookup) { |
256 | _debug("non-deferred lookup %p", &cookie->flags); | 256 | _debug("non-deferred lookup %p", &cookie->flags); |
257 | wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP, | 257 | wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP, |
258 | fscache_wait_bit, TASK_UNINTERRUPTIBLE); | 258 | TASK_UNINTERRUPTIBLE); |
259 | _debug("complete"); | 259 | _debug("complete"); |
260 | if (test_bit(FSCACHE_COOKIE_UNAVAILABLE, &cookie->flags)) | 260 | if (test_bit(FSCACHE_COOKIE_UNAVAILABLE, &cookie->flags)) |
261 | goto unavailable; | 261 | goto unavailable; |
@@ -463,7 +463,6 @@ void __fscache_wait_on_invalidate(struct fscache_cookie *cookie) | |||
463 | _enter("%p", cookie); | 463 | _enter("%p", cookie); |
464 | 464 | ||
465 | wait_on_bit(&cookie->flags, FSCACHE_COOKIE_INVALIDATING, | 465 | wait_on_bit(&cookie->flags, FSCACHE_COOKIE_INVALIDATING, |
466 | fscache_wait_bit_interruptible, | ||
467 | TASK_UNINTERRUPTIBLE); | 466 | TASK_UNINTERRUPTIBLE); |
468 | 467 | ||
469 | _leave(""); | 468 | _leave(""); |
@@ -525,7 +524,7 @@ void __fscache_disable_cookie(struct fscache_cookie *cookie, bool invalidate) | |||
525 | } | 524 | } |
526 | 525 | ||
527 | wait_on_bit_lock(&cookie->flags, FSCACHE_COOKIE_ENABLEMENT_LOCK, | 526 | wait_on_bit_lock(&cookie->flags, FSCACHE_COOKIE_ENABLEMENT_LOCK, |
528 | fscache_wait_bit, TASK_UNINTERRUPTIBLE); | 527 | TASK_UNINTERRUPTIBLE); |
529 | if (!test_and_clear_bit(FSCACHE_COOKIE_ENABLED, &cookie->flags)) | 528 | if (!test_and_clear_bit(FSCACHE_COOKIE_ENABLED, &cookie->flags)) |
530 | goto out_unlock_enable; | 529 | goto out_unlock_enable; |
531 | 530 | ||