summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2018-01-18 18:32:00 +0300
committerIlya Dryomov <idryomov@gmail.com>2018-01-29 17:23:01 +0300
commitd98f153f1a116f79e636edd34b4fec07e49ae9b2 (patch)
tree005a2f73e2d6538780cc9b93d5739c2c578dd13c /drivers/block
parenta0c5895b27f6bbf8aa20a2c640845fc261740051 (diff)
downloadlinux-d98f153f1a116f79e636edd34b4fec07e49ae9b2.tar.xz
rbd: don't NULL out ->obj_request in rbd_img_obj_parent_read_full()
If rbd_img_request_submit() fails, parent_request->obj_request is NULLed out, triggering an assert in rbd_obj_request_put(): rbd_img_request_put(parent_request) rbd_parent_request_destroy rbd_obj_request_put(NULL) Just remove it -- parent_request->obj_request will be put in rbd_parent_request_destroy(). Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/rbd.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 7646a2d3119c..4a886d8c4a3c 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -2682,8 +2682,6 @@ static int rbd_img_obj_parent_read_full(struct rbd_obj_request *obj_request)
parent_request->copyup_pages = NULL;
parent_request->copyup_page_count = 0;
- parent_request->obj_request = NULL;
- rbd_obj_request_put(obj_request);
out_err:
if (pages)
ceph_release_page_vector(pages, page_count);