diff options
author | Alex Elder <elder@inktank.com> | 2012-11-09 09:43:15 -0500 |
---|---|---|
committer | Alex Elder <elder@inktank.com> | 2013-01-17 16:52:01 -0500 |
commit | af77f26caa35a95af09d1dac5c513b3901de7e37 (patch) | |
tree | 9c5efeda0e8eead5ece30957f88d6155f677cb0c /drivers | |
parent | 0ec8ce87f3bb5e4a561190f5320934e003405b6f (diff) |
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')
-rw-r--r-- | drivers/block/rbd.c | 6 |
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, | |||
1176 | snapid, ofs, &len, &bno, osd_req, ops); | 1176 | snapid, ofs, &len, &bno, osd_req, ops); |
1177 | rbd_assert(ret == 0); | 1177 | rbd_assert(ret == 0); |
1178 | 1178 | ||
1179 | ceph_osdc_build_request(osd_req, ofs, &len, | 1179 | ceph_osdc_build_request(osd_req, ofs, &len, ops, snapc, &mtime); |
1180 | ops, | ||
1181 | snapc, | ||
1182 | &mtime, | ||
1183 | osd_req->r_oid, osd_req->r_oid_len); | ||
1184 | 1180 | ||
1185 | if (linger_req) { | 1181 | if (linger_req) { |
1186 | ceph_osdc_set_request_linger(osdc, osd_req); | 1182 | ceph_osdc_set_request_linger(osdc, osd_req); |