android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rbd: drop original request earlier for existence check

Browse Source 
The reference to the original request dropped at the end of
rbd_img_obj_exists_callback() corresponds to the reference taken
in rbd_img_obj_exists_submit() to account for the stat request
referring to it.  Move the put of that reference up right after
clearing that pointer to make its purpose more obvious.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder 2013-05-13 20:35:38 -05:00 committed by Sage Weil
parent 4d1bf79aff
commit 912c317d46
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/block/rbd.c
View File

@ -2535,6 +2535,7 @@ static void rbd_img_obj_exists_callback(struct rbd_obj_request *obj_request)
*/ */
orig_request = obj_request->obj_request; orig_request = obj_request->obj_request;
obj_request->obj_request = NULL; obj_request->obj_request = NULL;
rbd_obj_request_put(orig_request);
rbd_assert(orig_request); rbd_assert(orig_request);
rbd_assert(orig_request->img_request); rbd_assert(orig_request->img_request);
@ -2555,7 +2556,6 @@ static void rbd_img_obj_exists_callback(struct rbd_obj_request *obj_request)
if (!rbd_dev->parent_overlap) { if (!rbd_dev->parent_overlap) {
struct ceph_osd_client *osdc; struct ceph_osd_client *osdc;
rbd_obj_request_put(orig_request);
osdc = &rbd_dev->rbd_client->client->osdc; osdc = &rbd_dev->rbd_client->client->osdc;
result = rbd_obj_request_submit(osdc, orig_request); result = rbd_obj_request_submit(osdc, orig_request);
if (!result) if (!result)
@ -2585,7 +2585,6 @@ static void rbd_img_obj_exists_callback(struct rbd_obj_request *obj_request)
out: out:
if (orig_request->result) if (orig_request->result)
rbd_obj_request_complete(orig_request); rbd_obj_request_complete(orig_request);
rbd_obj_request_put(orig_request);
} }
static int rbd_img_obj_exists_submit(struct rbd_obj_request *obj_request) static int rbd_img_obj_exists_submit(struct rbd_obj_request *obj_request)