summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorJosh Durgin <josh.durgin@inktank.com>2014-04-07 23:54:10 (GMT)
committerIlya Dryomov <idryomov@redhat.com>2014-10-14 17:03:33 (GMT)
commitd0265de7c358d71a494dcd1ee28206b32754bb0f (patch)
tree47ddd34a1db3d1f6adeea09624733f1301ab10a8 /drivers/block
parentbef95455a44e2533fcea376740bb1a5cbd71269f (diff)
downloadlinux-d0265de7c358d71a494dcd1ee28206b32754bb0f.tar.xz
rbd: tolerate -ENOENT for discard operations
Discard may try to delete an object from a non-layered image that does not exist. If this occurs, the image already has no data in that range, so change the result to success. Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/rbd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index de1520c..835a96a 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1767,6 +1767,9 @@ static void rbd_osd_discard_callback(struct rbd_obj_request *obj_request)
* it to our originally-requested length.
*/
obj_request->xferred = obj_request->length;
+ /* discarding a non-existent object is not a problem */
+ if (obj_request->result == -ENOENT)
+ obj_request->result = 0;
obj_request_done_set(obj_request);
}