tree f6544ac65503d04b7760492e7f2592132e4a6d6c
parent ed24fee24a6be9568b1ee30209bafe4dad66be0e
parent 9c89d62948c4740e379a7e0085dd8d7c1561f53f
author Linus Torvalds <torvalds@linux-foundation.org> 1379613037 -0500
committer Linus Torvalds <torvalds@linux-foundation.org> 1379613037 -0500

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