rgw: s/wait_for_safe/wait_for_complete/

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index 55135fc00dea6f1994d9ee3fde13fbedb47b2d4f..bc0ee7cdc0ca01c05cb990274c460e0767dbb934 100644 (file)
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -409,7 +409,7 @@ static int rgw_remove_bucket(RGWRadosStore *store, rgw_bucket& bucket, bool dele
 static int aio_wait(librados::AioCompletion *handle)
 {
   librados::AioCompletion *c = (librados::AioCompletion *)handle;
-  c->wait_for_safe();
+  c->wait_for_complete();
   int ret = c->get_return_value();
   c->release();
   return ret;

diff --git a/src/rgw/rgw_gc.cc b/src/rgw/rgw_gc.cc
index c015e76c29f967ccc13797a1d44304b72d2eccaa..f44c367429e2d3519fd570ebe92fb901335e55e0 100644 (file)
--- a/src/rgw/rgw_gc.cc
+++ b/src/rgw/rgw_gc.cc
@@ -336,7 +336,7 @@ public:
   int handle_next_completion() {
     ceph_assert(!ios.empty());
     IO& io = ios.front();
-    io.c->wait_for_safe();
+    io.c->wait_for_complete();
     int ret = io.c->get_return_value();
     io.c->release();
 

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index e3ef936d255ee43c6ded6813d29b29ff77d88fef..ad27d5c2ab49148035ba374bf52dfb6f2f5cd4f3 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -5272,7 +5272,7 @@ int RGWRados::Object::Stat::wait()
     return state.ret;
   }
 
-  state.completion->wait_for_safe();
+  state.completion->wait_for_complete();
   state.ret = state.completion->get_return_value();
   state.completion->release();
 

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index 81656cba97fa03c2104f695c48ee864d5d0cf32b..f0e646a22ef36ac0ad3df4e4e58a3f8e3d5cbe43 100644 (file)
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -72,7 +72,7 @@ class BucketReshardShard {
     librados::AioCompletion *c = aio_completions.front();
     aio_completions.pop_front();
 
-    c->wait_for_safe();
+    c->wait_for_complete();
 
     int ret = c->get_return_value();
     c->release();

diff --git a/src/rgw/services/svc_notify.cc b/src/rgw/services/svc_notify.cc
index be8b08e50c5b2de3f94a0317ab366fac45c12845..5e3fbb2b6b91b8c262409ade34c887dec11d22a3 100644 (file)
--- a/src/rgw/services/svc_notify.cc
+++ b/src/rgw/services/svc_notify.cc
@@ -111,7 +111,7 @@ public:
     if (!register_completion) {
       return -EINVAL;
     }
-    register_completion->wait_for_safe();
+    register_completion->wait_for_complete();
     int r = register_completion->get_return_value();
     register_completion->release();
     register_completion = nullptr;