libceph: don't pass request to calc_layout()

The only remaining reason to pass the osd request to calc_layout()
is to fill in its r_num_pages and r_page_alignment fields.  Once it
fills those in, it doesn't do anything more with them.

We can therefore move those assignments into the caller, and get rid
of the "req" parameter entirely.

Note, however, that the only caller is ceph_osdc_new_request(),
and that immediately overwrites those fields with values based on
its passed-in page offset.  So the assignment inside calc_layout()
was redundant anyway.

This resolves:
    http://tracker.ceph.com/issues/4262

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

1 files changed, 4 insertions, 8 deletions

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index df72234e66e4..29e4fe09e31a 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -64,7 +64,6 @@ static int op_has_extent(int op)
  * fill osd op in request message.
  */
 static int calc_layout(struct ceph_file_layout *layout, u64 off, u64 *plen,
-                       struct ceph_osd_request *req,
                        struct ceph_osd_req_op *op, u64 *bno)
 {
         u64 orig_len = *plen;
@@ -95,13 +94,10 @@ static int calc_layout(struct ceph_file_layout *layout, u64 off, u64 *plen,
                                 op->extent.truncate_size = osize;
                 }
         }
-        req->r_num_pages = calc_pages_for(off, *plen);
-        req->r_page_alignment = off & ~PAGE_MASK;
         if (op->op == CEPH_OSD_OP_WRITE)
                 op->payload_len = *plen;
 
-        dout("calc_layout bno=%llx %llu~%llu (%d pages)\n",
-             *bno, objoff, objlen, req->r_num_pages);
+        dout("calc_layout bno=%llx %llu~%llu\n", *bno, objoff, objlen);
 
         return 0;
 }
@@ -464,7 +460,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
         req->r_flags = flags;
 
         /* calculate max write size */
-        r = calc_layout(layout, off, plen, req, ops, &bno);
+        r = calc_layout(layout, off, plen, ops, &bno);
         if (r < 0) {
                 ceph_osdc_put_request(req);
                 return ERR_PTR(r);
@@ -475,8 +471,8 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
         snprintf(req->r_oid, sizeof(req->r_oid), "%llx.%08llx", vino.ino, bno);
         req->r_oid_len = strlen(req->r_oid);
 
-        /* in case it differs from natural (file) alignment that
-           calc_layout filled in for us */
+        /* The alignment may differ from the natural (file) alignment */
+
         req->r_num_pages = calc_pages_for(page_align, *plen);
         req->r_page_alignment = page_align;