ceph: num_ops is off by one in ceph_aio_retry_work()

idryomov · idryomov · commit 61d2f855042c · 2018-10-22T10:28:21.000+02:00
Two OSD op slots are allocated, but only one is ever used.

Signed-off-by: Ilya Dryomov &lt;idryomov@gmail.com&gt;
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
@@ -858,7 +858,7 @@ static void ceph_aio_retry_work(struct work_struct *work)
 	}
 	spin_unlock(&ci->i_ceph_lock);
 
-	req = ceph_osdc_alloc_request(orig_req->r_osdc, snapc, 2,
+	req = ceph_osdc_alloc_request(orig_req->r_osdc, snapc, 1,
 			false, GFP_NOFS);
 	if (!req) {
 		ret = -ENOMEM;

Original file line number	Diff line number	Diff line change
`@@ -858,7 +858,7 @@ static void ceph_aio_retry_work(struct work_struct *work)`
`858`	`858`	`}`
`859`	`859`	`spin_unlock(&ci->i_ceph_lock);`
`860`	`860`
`861`		`- req = ceph_osdc_alloc_request(orig_req->r_osdc, snapc, 2,`
	`861`	`+ req = ceph_osdc_alloc_request(orig_req->r_osdc, snapc, 1,`
`862`	`862`	`false, GFP_NOFS);`
`863`	`863`	`if (!req) {`
`864`	`864`	`ret = -ENOMEM;`