From: Josh Durgin Date: Sat, 5 Apr 2014 00:49:12 +0000 (-0700) Subject: rbd: make discard trigger copy-on-write X-Git-Tag: v3.18-rc1~42^2~21 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1c220881e307b62cc2f77d911219de332aa3f61e;p=karo-tx-linux.git rbd: make discard trigger copy-on-write Discard requests are a form of write, so they should go through the same process as plain write requests and trigger copy-on-write for layered images. Signed-off-by: Josh Durgin --- diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 835a96a09a6b..6fb93cd6957f 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2851,7 +2851,8 @@ static bool img_obj_request_simple(struct rbd_obj_request *obj_request) rbd_dev = img_request->rbd_dev; /* Reads */ - if (!img_request_write_test(img_request)) + if (!img_request_write_test(img_request) && + !img_request_discard_test(img_request)) return true; /* Non-layered writes */