diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /fs/fscache/cookie.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'fs/fscache/cookie.c')
| -rw-r--r-- | fs/fscache/cookie.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c index 318e8433527c..b2a86e324aac 100644 --- a/fs/fscache/cookie.c +++ b/fs/fscache/cookie.c | |||
| @@ -586,7 +586,8 @@ int __fscache_check_consistency(struct fscache_cookie *cookie) | |||
| 586 | 586 | ||
| 587 | fscache_operation_init(op, NULL, NULL); | 587 | fscache_operation_init(op, NULL, NULL); |
| 588 | op->flags = FSCACHE_OP_MYTHREAD | | 588 | op->flags = FSCACHE_OP_MYTHREAD | |
| 589 | (1 << FSCACHE_OP_WAITING); | 589 | (1 << FSCACHE_OP_WAITING) | |
| 590 | (1 << FSCACHE_OP_UNUSE_COOKIE); | ||
| 590 | 591 | ||
| 591 | spin_lock(&cookie->lock); | 592 | spin_lock(&cookie->lock); |
| 592 | 593 | ||