summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-11-09 08:43:15 -0600
committerAlex Elder <elder@inktank.com>2013-01-17 15:52:01 -0600
commitaf77f26caa35a95af09d1dac5c513b3901de7e37 (patch)
tree9c5efeda0e8eead5ece30957f88d6155f677cb0c /drivers/block
parent0ec8ce87f3bb5e4a561190f5320934e003405b6f (diff)
downloadblackbird-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 'drivers/block')
-rw-r--r--drivers/block/rbd.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index d4e93a28fb6a..9a701effa0ef 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1176,11 +1176,7 @@ static int rbd_do_request(struct request *rq,
snapid, ofs, &len, &bno, osd_req, ops);
rbd_assert(ret == 0);
- ceph_osdc_build_request(osd_req, ofs, &len,
- ops,
- snapc,
- &mtime,
- osd_req->r_oid, osd_req->r_oid_len);
+ ceph_osdc_build_request(osd_req, ofs, &len, ops, snapc, &mtime);
if (linger_req) {
ceph_osdc_set_request_linger(osdc, osd_req);
OpenPOWER on IntegriCloud