libceph: rename ceph_osd_request::r_{oloc,oid} to r_base_{oloc,oid}

Rename ceph_osd_request::r_{oloc,oid} to r_base_{oloc,oid} before
introducing r_target_{oloc,oid} needed for redirects.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 6fdc5fc00447..16cab6635163 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1808,8 +1808,8 @@ static struct ceph_osd_request *rbd_osd_req_create(
         osd_req->r_callback = rbd_osd_req_callback;
         osd_req->r_priv = obj_request;
 
-        osd_req->r_oloc.pool = ceph_file_layout_pg_pool(rbd_dev->layout);
-        ceph_oid_set_name(&osd_req->r_oid, obj_request->object_name);
+        osd_req->r_base_oloc.pool = ceph_file_layout_pg_pool(rbd_dev->layout);
+        ceph_oid_set_name(&osd_req->r_base_oid, obj_request->object_name);
 
         return osd_req;
 }
@@ -1846,8 +1846,8 @@ rbd_osd_req_create_copyup(struct rbd_obj_request *obj_request)
         osd_req->r_callback = rbd_osd_req_callback;
         osd_req->r_priv = obj_request;
 
-        osd_req->r_oloc.pool = ceph_file_layout_pg_pool(rbd_dev->layout);
-        ceph_oid_set_name(&osd_req->r_oid, obj_request->object_name);
+        osd_req->r_base_oloc.pool = ceph_file_layout_pg_pool(rbd_dev->layout);
+        ceph_oid_set_name(&osd_req->r_base_oid, obj_request->object_name);
 
         return osd_req;
 }