libceph: hold off building osd request

Defer building the osd request until just before submitting it in
all callers except ceph_writepages_start().  (That caller will be
handed in the next patch.)

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 7b6d9b22e254..0a3d2ce89660 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -319,8 +319,6 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max)
         if (IS_ERR(req))
                 return PTR_ERR(req);
 
-        ceph_osdc_build_request(req, off, 1, &op, NULL, vino.snap, NULL);
-
         /* build page vector */
         nr_pages = calc_pages_for(0, len);
         pages = kmalloc(sizeof(*pages) * nr_pages, GFP_NOFS);
@@ -351,6 +349,8 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max)
         req->r_callback = finish_read;
         req->r_inode = inode;
 
+        ceph_osdc_build_request(req, off, 1, &op, NULL, vino.snap, NULL);
+
         dout("start_read %p starting %p %lld~%lld\n", inode, req, off, len);
         ret = ceph_osdc_start_request(osdc, req, false);
         if (ret < 0)