From: Ilya Dryomov <idryomov@gmail.com>
Date: Fri, 1 Mar 2019 11:06:24 +0000 (+0100)
Subject: rbd: clear ->xferred on error from rbd_obj_issue_copyup()
X-Git-Tag: v4.19.99~386
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=080ba12cc1ce27b408e4de35f7ec7c7bf0615a4d;p=thirdparty%2Fkernel%2Fstable.git

rbd: clear ->xferred on error from rbd_obj_issue_copyup()

[ 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>
---

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 585378bc988cd..b942f4c8cea8c 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -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;