summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-19 12:50:37 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-19 12:50:37 -0500
commite9ff04dd94d46c817bbb103531cdef6e7bd5d022 (patch)
treef6544ac65503d04b7760492e7f2592132e4a6d6c /fs
parented24fee24a6be9568b1ee30209bafe4dad66be0e (diff)
parent9c89d62948c4740e379a7e0085dd8d7c1561f53f (diff)
downloadop-kernel-dev-e9ff04dd94d46c817bbb103531cdef6e7bd5d022.zip
op-kernel-dev-e9ff04dd94d46c817bbb103531cdef6e7bd5d022.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull ceph fixes from Sage Weil: "These fix several bugs with RBD from 3.11 that didn't get tested in time for the merge window: some error handling, a use-after-free, and a sequencing issue when unmapping and image races with a notify operation. There is also a patch fixing a problem with the new ceph + fscache code that just went in" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: fscache: check consistency does not decrement refcount rbd: fix error handling from rbd_snap_name() rbd: ignore unmapped snapshots that no longer exist rbd: fix use-after free of rbd_dev->disk rbd: make rbd_obj_notify_ack() synchronous rbd: complete notifies before cleaning up osd_client and rbd_dev libceph: add function to ensure notifies are complete
Diffstat (limited to 'fs')
-rw-r--r--fs/fscache/cookie.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
index 318e843..b2a86e3 100644
--- a/fs/fscache/cookie.c
+++ b/fs/fscache/cookie.c
@@ -586,7 +586,8 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
fscache_operation_init(op, NULL, NULL);
op->flags = FSCACHE_OP_MYTHREAD |
- (1 << FSCACHE_OP_WAITING);
+ (1 << FSCACHE_OP_WAITING) |
+ (1 << FSCACHE_OP_UNUSE_COOKIE);
spin_lock(&cookie->lock);
OpenPOWER on IntegriCloud