rbd: update rbd_img_request_submit() signature

It should be void now.  Also, object requests are unlinked only in
image request destructor, which can't run before rbd_img_request_put(),
so no need for _safe.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index e542fda18395ceb3ddf9cffa3c089fa3745b85bf..015bd5303f0e5fe7c5cc7bbc9023c699439a92e4 100644 (file)
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -2223,21 +2223,17 @@ out_unwind:
        return -ENOMEM;
 }
 
-static int rbd_img_request_submit(struct rbd_img_request *img_request)
+static void rbd_img_request_submit(struct rbd_img_request *img_request)
 {
        struct rbd_obj_request *obj_request;
-       struct rbd_obj_request *next_obj_request;
-       int ret = 0;
 
        dout("%s: img %p\n", __func__, img_request);
 
        rbd_img_request_get(img_request);
-       for_each_obj_request_safe(img_request, obj_request, next_obj_request) {
+       for_each_obj_request(img_request, obj_request)
                rbd_obj_request_submit(obj_request);
-       }
 
        rbd_img_request_put(img_request);
-       return ret;
 }
 
 static void rbd_img_end_child_request(struct rbd_img_request *img_req);
@@ -3668,10 +3664,7 @@ static void rbd_queue_workfn(struct work_struct *work)
        if (result)
                goto err_img_request;
 
-       result = rbd_img_request_submit(img_request);
-       if (result)
-               goto err_img_request;
-
+       rbd_img_request_submit(img_request);
        if (must_be_locked)
                up_read(&rbd_dev->lock_rwsem);
        return;