OSDN Git Service

rbd: clear ->xferred on error from rbd_obj_issue_copyup()
authorIlya Dryomov <idryomov@gmail.com>
Fri, 1 Mar 2019 11:06:24 +0000 (12:06 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jan 2020 13:50:30 +0000 (14:50 +0100)
[ Upstream commit 356889c49d84f11f446ec235bd52ca1a7d581aa0 ]

Otherwise the assert in rbd_obj_end_request() is triggered.

Fixes: 3da691bf4366 ("rbd: new request handling code")
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/block/rbd.c

index 585378b..b942f4c 100644 (file)
@@ -2506,6 +2506,7 @@ again:
                ret = rbd_obj_issue_copyup(obj_req, obj_req->xferred);
                if (ret) {
                        obj_req->result = ret;
+                       obj_req->xferred = 0;
                        return true;
                }
                return false;