diff options
| author | Alex Elder <elder@inktank.com> | 2012-11-09 08:43:15 -0600 |
|---|---|---|
| committer | Alex Elder <elder@inktank.com> | 2013-01-17 15:52:01 -0600 |
| commit | af77f26caa35a95af09d1dac5c513b3901de7e37 (patch) | |
| tree | 9c5efeda0e8eead5ece30957f88d6155f677cb0c /net | |
| parent | 0ec8ce87f3bb5e4a561190f5320934e003405b6f (diff) | |
| download | blackbird-op-linux-af77f26caa35a95af09d1dac5c513b3901de7e37.tar.gz blackbird-op-linux-af77f26caa35a95af09d1dac5c513b3901de7e37.zip | |
rbd: drop oid parameters from ceph_osdc_build_request()
The last two parameters to ceph_osd_build_request() describe the
object id, but the values passed always come from the osd request
structure whose address is also provided. Get rid of those last
two parameters.
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/osd_client.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index eade41bb7102..7d38327a8e89 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -376,9 +376,7 @@ void ceph_osdc_build_request(struct ceph_osd_request *req, u64 off, u64 *plen, struct ceph_osd_req_op *src_ops, struct ceph_snap_context *snapc, - struct timespec *mtime, - const char *oid, - int oid_len) + struct timespec *mtime) { struct ceph_msg *msg = req->r_request; struct ceph_osd_request_head *head; @@ -405,9 +403,9 @@ void ceph_osdc_build_request(struct ceph_osd_request *req, /* fill in oid */ - head->object_len = cpu_to_le32(oid_len); - memcpy(p, oid, oid_len); - p += oid_len; + head->object_len = cpu_to_le32(req->r_oid_len); + memcpy(p, req->r_oid, req->r_oid_len); + p += req->r_oid_len; src_op = src_ops; while (src_op->op) { @@ -506,8 +504,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc, ceph_osdc_build_request(req, off, plen, ops, snapc, - mtime, - req->r_oid, req->r_oid_len); + mtime); return req; } |
