Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54a54007 authored by Alex Elder's avatar Alex Elder
Browse files

libceph: don't set pages or bio in ceph_osdc_alloc_request() 



Only one of the two callers of ceph_osdc_alloc_request() provides
page or bio data for its payload.  And essentially all that function
was doing with those arguments was assigning them to fields in the
osd request structure.

Simplify ceph_osdc_alloc_request() by having the caller take care of
making those assignments

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent d178a9e7

drivers/block/rbd.c

+6 −2
Original line number Diff line number Diff line
@@ -1148,14 +1148,18 @@ static int rbd_do_request(struct request *rq, 
		(unsigned long long) len, coll, coll_index);



	osdc = &rbd_dev->rbd_client->client->osdc;

	osd_req = ceph_osdc_alloc_request(osdc, snapc, ops,

					false, GFP_NOIO, pages, bio);

	osd_req = ceph_osdc_alloc_request(osdc, snapc, ops, false, GFP_NOIO);

	if (!osd_req) {

		ret = -ENOMEM;

		goto done_pages;

	}



	osd_req->r_flags = flags;

	osd_req->r_pages = pages;

	if (bio) {

		osd_req->r_bio = bio;

		bio_get(osd_req->r_bio);

	}

	osd_req->r_callback = rbd_cb;



	rbd_req->rq = rq;

include/linux/ceph/osd_client.h

+1 −3
Original line number Diff line number Diff line
@@ -216,9 +216,7 @@ extern struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client * 
					       struct ceph_snap_context *snapc,

					       struct ceph_osd_req_op *ops,

					       bool use_mempool,

					       gfp_t gfp_flags,

					       struct page **pages,

					       struct bio *bio);

					       gfp_t gfp_flags);



extern void ceph_osdc_build_request(struct ceph_osd_request *req,

				    u64 off, u64 len,

net/ceph/osd_client.c

+2 −13
Original line number Diff line number Diff line
@@ -174,9 +174,7 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, 
					       struct ceph_snap_context *snapc,

					       struct ceph_osd_req_op *ops,

					       bool use_mempool,

					       gfp_t gfp_flags,

					       struct page **pages,

					       struct bio *bio)

					       gfp_t gfp_flags)

{

	struct ceph_osd_request *req;

	struct ceph_msg *msg;
@@ -237,13 +235,6 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, 
	memset(msg->front.iov_base, 0, msg->front.iov_len);



	req->r_request = msg;

	req->r_pages = pages;

#ifdef CONFIG_BLOCK

	if (bio) {

		req->r_bio = bio;

		bio_get(req->r_bio);

	}

#endif



	return req;

}
@@ -439,9 +430,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc, 
	} else

		ops[1].op = 0;



	req = ceph_osdc_alloc_request(osdc, snapc, ops,

					 use_mempool,

					 GFP_NOFS, NULL, NULL);

	req = ceph_osdc_alloc_request(osdc, snapc, ops, use_mempool, GFP_NOFS);

	if (!req)

		return ERR_PTR(-ENOMEM);

	req->r_flags = flags;