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
Showing the changes to include/linux (1 of 4 files). Show all
Unified · Split
| @@ -335,6 +335,8 @@ extern int ceph_osdc_wait_request(struct ceph_osd_client *osdc, · 334 unmodified lines | |||
| 335 | struct ceph_osd_request *req); | 335 | struct ceph_osd_request *req); |
| 336 | extern void ceph_osdc_sync(struct ceph_osd_client *osdc); | 336 | extern void ceph_osdc_sync(struct ceph_osd_client *osdc); |
| 337 | 337 | ||
| 338 | extern void ceph_osdc_flush_notifies(struct ceph_osd_client *osdc); | ||
| 339 | |||
| 338 | extern int ceph_osdc_readpages(struct ceph_osd_client *osdc, | 340 | extern int ceph_osdc_readpages(struct ceph_osd_client *osdc, |
| 339 | struct ceph_vino vino, | 341 | struct ceph_vino vino, |
| 340 | struct ceph_file_layout *layout, | 342 | struct ceph_file_layout *layout, |