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

rbd: remove out_partial label in rbd_img_request_fill()

Browse Source 
Commit 03507db631 ("rbd: fix buffer size for writes to images with
snapshots") moved the call to rbd_img_obj_request_add() up, making the
out_partial label bogus.  Remove it.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Alex Elder <elder@linaro.org>
This commit is contained in:
Ilya Dryomov 2014-03-04 11:57:17 +02:00 committed by Yan, Zheng
parent 9d521470a4
commit 62054da65c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/block/rbd.c
View File

@ -2190,6 +2190,7 @@ static int rbd_img_request_fill(struct rbd_img_request *img_request,
rbd_segment_name_free(object_name); rbd_segment_name_free(object_name);
if (!obj_request) if (!obj_request)
goto out_unwind; goto out_unwind;
/* /*
* set obj_request->img_request before creating the * set obj_request->img_request before creating the
* osd_request so that it gets the right snapc * osd_request so that it gets the right snapc
@ -2207,7 +2208,7 @@ static int rbd_img_request_fill(struct rbd_img_request *img_request,
clone_size, clone_size,
GFP_ATOMIC); GFP_ATOMIC);
if (!obj_request->bio_list) if (!obj_request->bio_list)
goto out_partial; goto out_unwind;
} else { } else {
unsigned int page_count; unsigned int page_count;
@ -2222,7 +2223,7 @@ static int rbd_img_request_fill(struct rbd_img_request *img_request,
osd_req = rbd_osd_req_create(rbd_dev, write_request, osd_req = rbd_osd_req_create(rbd_dev, write_request,
obj_request); obj_request);
if (!osd_req) if (!osd_req)
goto out_partial; goto out_unwind;
obj_request->osd_req = osd_req; obj_request->osd_req = osd_req;
obj_request->callback = rbd_img_obj_callback; obj_request->callback = rbd_img_obj_callback;
@ -2249,8 +2250,6 @@ static int rbd_img_request_fill(struct rbd_img_request *img_request,
return 0; return 0;
out_partial:
rbd_obj_request_put(obj_request);
out_unwind: out_unwind:
for_each_obj_request_safe(img_request, obj_request, next_obj_request) for_each_obj_request_safe(img_request, obj_request, next_obj_request)
rbd_obj_request_put(obj_request); rbd_obj_request_put(obj_request);