1 files changed, 9 insertions, 8 deletions

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index a053e7e4a780..2988d68b24c6 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -765,9 +765,9 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
 
         req->r_oloc.pool = ceph_file_layout_pg_pool(*layout);
 
-        snprintf(req->r_oid, sizeof(req->r_oid), "%llx.%08llx",
-                vino.ino, objnum);
-        req->r_oid_len = strlen(req->r_oid);
+        snprintf(req->r_oid.name, sizeof(req->r_oid.name),
+                 "%llx.%08llx", vino.ino, objnum);
+        req->r_oid.name_len = strlen(req->r_oid.name);
 
         return req;
 }
@@ -1269,7 +1269,7 @@ static int __map_request(struct ceph_osd_client *osdc,
         bool was_paused;
 
         dout("map_request %p tid %lld\n", req, req->r_tid);
-        err = ceph_calc_ceph_pg(&pgid, req->r_oid, osdc->osdmap,
+        err = ceph_calc_ceph_pg(&pgid, req->r_oid.name, osdc->osdmap,
                                 req->r_oloc.pool);
         if (err) {
                 list_move(&req->r_req_lru_item, &osdc->req_notarget);
@@ -2118,10 +2118,11 @@ void ceph_osdc_build_request(struct ceph_osd_request *req, u64 off,
         ceph_encode_32(&p, -1);  /* preferred */
 
         /* oid */
-        ceph_encode_32(&p, req->r_oid_len);
-        memcpy(p, req->r_oid, req->r_oid_len);
-        dout("oid '%.*s' len %d\n", req->r_oid_len, req->r_oid, req->r_oid_len);
-        p += req->r_oid_len;
+        ceph_encode_32(&p, req->r_oid.name_len);
+        memcpy(p, req->r_oid.name, req->r_oid.name_len);
+        dout("oid '%.*s' len %d\n", req->r_oid.name_len,
+             req->r_oid.name, req->r_oid.name_len);
+        p += req->r_oid.name_len;
 
         /* ops--can imply data */
         ceph_encode_16(&p, (u16)req->r_num_ops);