update ceph source to reef 18.1.2

[ceph.git] / ceph / src / rgw / rgw_os_lib.cc

diff --git a/ceph/src/rgw/rgw_os_lib.cc b/ceph/src/rgw/rgw_os_lib.cc
index 379f4a911a457de201731ceab51e6df342fab6d0..55eb2fb4ba38e7d3dea6782a7d1c61c359d044eb 100644 (file)
--- a/ceph/src/rgw/rgw_os_lib.cc
+++ b/ceph/src/rgw/rgw_os_lib.cc
@@ -11,8 +11,8 @@
 namespace rgw {
 
 /* static */
-  int RGWHandler_Lib::init_from_header(rgw::sal::Store* store,
-                                      struct req_state *s)
+  int RGWHandler_Lib::init_from_header(rgw::sal::Driver* driver,
+                                      req_state *s)
   {
     string req;
     string first;
@@ -52,10 +52,10 @@ namespace rgw {
       if (pos >= 0) {
        // XXX ugh, another copy
        string encoded_obj_str = req.substr(pos+1);
-       s->object = store->get_object(rgw_obj_key(encoded_obj_str, s->info.args.get("versionId")));
+       s->object = driver->get_object(rgw_obj_key(encoded_obj_str, s->info.args.get("versionId")));
       }
     } else {
-      s->object = store->get_object(rgw_obj_key(req_name, s->info.args.get("versionId")));
+      s->object = driver->get_object(rgw_obj_key(req_name, s->info.args.get("versionId")));
     }
     return 0;
   } /* init_from_header */