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

idryomov · idryomov · commit 356889c49d84 · 2019-03-05T18:55:17.000+01:00
Otherwise the assert in rbd_obj_end_request() is triggered. Fixes: 3da691b ("rbd: new request handling code") Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
@@ -2585,6 +2585,7 @@ static bool rbd_obj_handle_write(struct rbd_obj_request *obj_req)
 		ret = rbd_obj_issue_copyup(obj_req, obj_req->xferred);
 		if (ret) {
 			obj_req->result = ret;
+			obj_req->xferred = 0;
 			return true;
 		}
 		return false;

Original file line number	Diff line number	Diff line change
`@@ -2585,6 +2585,7 @@ static bool rbd_obj_handle_write(struct rbd_obj_request *obj_req)`
`2585`	`2585`	`ret = rbd_obj_issue_copyup(obj_req, obj_req->xferred);`
`2586`	`2586`	`if (ret) {`
`2587`	`2587`	`obj_req->result = ret;`
	`2588`	`+ obj_req->xferred = 0;`
`2588`	`2589`	`return true;`
`2589`	`2590`	`}`
`2590`	`2591`	`return false;`