2 files changed, 8 insertions, 5 deletions

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index c9da074f0fe6..0ac3a37753cb 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -343,7 +343,8 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max)
                 }
                 pages[i] = page;
         }
-        ceph_osd_data_pages_init(&req->r_data_in, pages, len, 0,
+        BUG_ON(req->r_ops[0].extent.osd_data != &req->r_data_in);
+        ceph_osd_data_pages_init(req->r_ops[0].extent.osd_data, pages, len, 0,
                                         false, false);
         req->r_callback = finish_read;
         req->r_inode = inode;
@@ -916,8 +917,9 @@ get_more_pages:
                 dout("writepages got %d pages at %llu~%llu\n",
                      locked_pages, offset, len);
 
-                ceph_osd_data_pages_init(&req->r_data_out, pages, len, 0,
-                                                !!pool, false);
+                BUG_ON(req->r_ops[0].extent.osd_data != &req->r_data_out);
+                ceph_osd_data_pages_init(req->r_ops[0].extent.osd_data, pages,
+                                                len, 0, !!pool, false);
 
                 pages = NULL;   /* request message now owns the pages array */
                 pool = NULL;
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index a12f47642c40..cddc10fd7cf9 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -574,8 +574,9 @@ more:
                         own_pages = true;
                 }
         }
-        ceph_osd_data_pages_init(&req->r_data_out, pages, len, page_align,
-                                        false, own_pages);
+        BUG_ON(req->r_ops[0].extent.osd_data != &req->r_data_out);
+        ceph_osd_data_pages_init(req->r_ops[0].extent.osd_data, pages, len,
+                                        page_align, false, own_pages);
 
         /* BUG_ON(vino.snap != CEPH_NOSNAP); */
         ceph_osdc_build_request(req, pos, snapc, vino.snap, &mtime);