From d0265de7c358d71a494dcd1ee28206b32754bb0f Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Mon, 7 Apr 2014 16:54:10 -0700 Subject: 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 --- drivers/block/rbd.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'drivers') diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index de1520ccc0d4..835a96a09a6b 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); } -- cgit v1.2.3-58-ga151