3 files changed, 5 insertions, 5 deletions

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 54bd9fc3ef7c..c1b135b6cb97 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1172,7 +1172,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);
+        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 61562c792855..4bfb4582439a 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -224,7 +224,7 @@ extern struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *
                                                struct bio *bio);
 
 extern void ceph_osdc_build_request(struct ceph_osd_request *req,
-                                    u64 off, u64 *plen,
+                                    u64 off, u64 len,
                                     struct ceph_osd_req_op *src_ops,
                                     struct ceph_snap_context *snapc,
                                     struct timespec *mtime);
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 37d43d5b828c..e29a3ed92958 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -336,7 +336,7 @@ static void osd_req_encode_op(struct ceph_osd_request *req,
  *
  */
 void ceph_osdc_build_request(struct ceph_osd_request *req,
-                             u64 off, u64 *plen,
+                             u64 off, u64 len,
                              struct ceph_osd_req_op *src_ops,
                              struct ceph_snap_context *snapc,
                              struct timespec *mtime)
@@ -390,7 +390,7 @@ void ceph_osdc_build_request(struct ceph_osd_request *req,
 
         if (flags & CEPH_OSD_FLAG_WRITE) {
                 req->r_request->hdr.data_off = cpu_to_le16(off);
-                req->r_request->hdr.data_len = cpu_to_le32(*plen + data_len);
+                req->r_request->hdr.data_len = cpu_to_le32(len + data_len);
         } else if (data_len) {
                 req->r_request->hdr.data_off = 0;
                 req->r_request->hdr.data_len = cpu_to_le32(data_len);
@@ -464,7 +464,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
         req->r_num_pages = calc_pages_for(page_align, *plen);
         req->r_page_alignment = page_align;
 
-        ceph_osdc_build_request(req, off, plen, ops,
+        ceph_osdc_build_request(req, off, *plen, ops,
                                 snapc,
                                 mtime);