3 files changed, 9 insertions, 18 deletions

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index bdbaa4cfd9d3..d1445df6398a 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1148,14 +1148,18 @@ static int rbd_do_request(struct request *rq,
                 (unsigned long long) len, coll, coll_index);
 
         osdc = &rbd_dev->rbd_client->client->osdc;
-        osd_req = ceph_osdc_alloc_request(osdc, snapc, ops,
-                                        false, GFP_NOIO, pages, bio);
+        osd_req = ceph_osdc_alloc_request(osdc, snapc, ops, false, GFP_NOIO);
         if (!osd_req) {
                 ret = -ENOMEM;
                 goto done_pages;
         }
 
         osd_req->r_flags = flags;
+        osd_req->r_pages = pages;
+        if (bio) {
+                osd_req->r_bio = bio;
+                bio_get(osd_req->r_bio);
+        }
         osd_req->r_callback = rbd_cb;
 
         rbd_req->rq = rq;
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 6ddda5bbd1a6..75f56d372d44 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -216,9 +216,7 @@ extern struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *
                                                struct ceph_snap_context *snapc,
                                                struct ceph_osd_req_op *ops,
                                                bool use_mempool,
-                                               gfp_t gfp_flags,
-                                               struct page **pages,
-                                               struct bio *bio);
+                                               gfp_t gfp_flags);
 
 extern void ceph_osdc_build_request(struct ceph_osd_request *req,
                                     u64 off, u64 len,
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 77ce1edaa07d..bdc3bb12bfd5 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -174,9 +174,7 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,
                                                struct ceph_snap_context *snapc,
                                                struct ceph_osd_req_op *ops,
                                                bool use_mempool,
-                                               gfp_t gfp_flags,
-                                               struct page **pages,
-                                               struct bio *bio)
+                                               gfp_t gfp_flags)
 {
         struct ceph_osd_request *req;
         struct ceph_msg *msg;
@@ -237,13 +235,6 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,
         memset(msg->front.iov_base, 0, msg->front.iov_len);
 
         req->r_request = msg;
-        req->r_pages = pages;
-#ifdef CONFIG_BLOCK
-        if (bio) {
-                req->r_bio = bio;
-                bio_get(req->r_bio);
-        }
-#endif
 
         return req;
 }
@@ -439,9 +430,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
         } else
                 ops[1].op = 0;
 
-        req = ceph_osdc_alloc_request(osdc, snapc, ops,
-                                         use_mempool,
-                                         GFP_NOFS, NULL, NULL);
+        req = ceph_osdc_alloc_request(osdc, snapc, ops, use_mempool, GFP_NOFS);
         if (!req)
                 return ERR_PTR(-ENOMEM);
         req->r_flags = flags;