forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libceph: don't set flags in ceph_osdc_alloc_request()

Browse source 
The only thing ceph_osdc_alloc_request() really does with the
flags value it is passed is assign it to the newly-created
osd request structure.  Do that in the caller instead.

Both callers subsequently call ceph_osdc_build_request(), so have
that function (instead of ceph_osdc_alloc_request()) issue a warning
if a request comes through with neither the read nor write flags set.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder 2012-11-13 21:11:15 -06:00
commit d178a9e740
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/block/rbd.c
View file

@ -1148,13 +1148,14 @@ static int rbd_do_request(struct request *rq,
(unsigned long long) len, coll, coll_index); (unsigned long long) len, coll, coll_index);
osdc = &rbd_dev->rbd_client->client->osdc; osdc = &rbd_dev->rbd_client->client->osdc;
osd_req = ceph_osdc_alloc_request(osdc, flags, snapc, ops, osd_req = ceph_osdc_alloc_request(osdc, snapc, ops,
false, GFP_NOIO, pages, bio); false, GFP_NOIO, pages, bio);
if (!osd_req) { if (!osd_req) {
ret = -ENOMEM; ret = -ENOMEM;
goto done_pages; goto done_pages;
} }
osd_req->r_flags = flags;
osd_req->r_callback = rbd_cb; osd_req->r_callback = rbd_cb;
rbd_req->rq = rq; rbd_req->rq = rq;

1
include/linux/ceph/osd_client.h
View file

@ -213,7 +213,6 @@ extern int ceph_calc_raw_layout(struct ceph_file_layout *layout,
struct ceph_osd_req_op *op); struct ceph_osd_req_op *op);
extern struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, extern struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,
int flags,
struct ceph_snap_context *snapc, struct ceph_snap_context *snapc,
struct ceph_osd_req_op *ops, struct ceph_osd_req_op *ops,
bool use_mempool, bool use_mempool,

11
net/ceph/osd_client.c
View file

@ -171,7 +171,6 @@ static int get_num_ops(struct ceph_osd_req_op *ops)
} }
struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,
int flags,
struct ceph_snap_context *snapc, struct ceph_snap_context *snapc,
struct ceph_osd_req_op *ops, struct ceph_osd_req_op *ops,
bool use_mempool, bool use_mempool,
@ -208,10 +207,6 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,
INIT_LIST_HEAD(&req->r_req_lru_item); INIT_LIST_HEAD(&req->r_req_lru_item);
INIT_LIST_HEAD(&req->r_osd_item); INIT_LIST_HEAD(&req->r_osd_item);
req->r_flags = flags;
WARN_ON((flags & (CEPH_OSD_FLAG_READ|CEPH_OSD_FLAG_WRITE)) == 0);
/* create reply message */ /* create reply message */
if (use_mempool) if (use_mempool)
msg = ceph_msgpool_get(&osdc->msgpool_op_reply, 0); msg = ceph_msgpool_get(&osdc->msgpool_op_reply, 0);
@ -347,6 +342,8 @@ void ceph_osdc_build_request(struct ceph_osd_request *req,
u64 data_len = 0; u64 data_len = 0;
int i; int i;
WARN_ON((flags & (CEPH_OSD_FLAG_READ|CEPH_OSD_FLAG_WRITE)) == 0);
head = msg->front.iov_base; head = msg->front.iov_base;
head->snapid = cpu_to_le64(snap_id); head->snapid = cpu_to_le64(snap_id);
op = (void *)(head + 1); op = (void *)(head + 1);
@ -442,12 +439,12 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
} else } else
ops[1].op = 0; ops[1].op = 0;
req = ceph_osdc_alloc_request(osdc, flags, req = ceph_osdc_alloc_request(osdc, snapc, ops,
snapc, ops,
use_mempool, use_mempool,
GFP_NOFS, NULL, NULL); GFP_NOFS, NULL, NULL);
if (!req) if (!req)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
req->r_flags = flags;
/* calculate max write size */ /* calculate max write size */
r = calc_layout(vino, layout, off, plen, req, ops); r = calc_layout(vino, layout, off, plen, req, ops);