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>

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index d4e93a28fb6a93f9b24446490158402c1fc98458..9a701effa0ef0ae54f6a5e4e1e2fa7e8f5358c73 100644 (file)
--- 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);

diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index d9b880e977e62fa5dcf853baf8dbffedf8c38cda..f2e5d2cdca06307dbfc2e2ca092adb7ac04d647f 100644 (file)
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -227,9 +227,7 @@ extern 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);
 
 extern struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *,
                                      struct ceph_file_layout *layout,

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index eade41bb7102be5b8b925e48c98bfca25bca6f74..7d38327a8e8990a5d9b16fcea9dc20981af5a385 100644 (file)
--- 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;
 }