The first patch in this series fixes a potential race, which may have been related to http://tracker.ceph.com/issues/7465, though there's not enough information to tell. I put it before the discard-related patches so it could be cherry-picked to older kernels as needed. The next three patches are rebased versions of Guangliang's discard patches, which have already been reviewd. The rest are bug fixes which made discard work in my testing for format 1 and layered format 2 images. Guangliang Zhao (3): rbd: skip the copyup when an entire object writing rbd: extend the operation type rbd: add discard support for rbd Josh Durgin (8): rbd: access snapshot context and mapping size safely rbd: read image size for discard check safely rbd: fix snapshot context reference count for discards rbd: tolerate -ENOENT for discard operations rbd: make discard trigger copy-on-write rbd: extract a method for adding object operations rbd: use helpers to handle discard for layered images correctly rbd: set the remaining discard properties to enable support drivers/block/rbd.c | 385 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 269 insertions(+), 116 deletions(-) -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html