From: Kefu Chai <kchai@redhat.com>
Date: Tue, 22 Oct 2019 07:07:35 +0000 (+0800)
Subject: rgw: s/wait_for_safe/wait_for_complete/
X-Git-Tag: v15.1.0~1090^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f5afc9386b84388d145c85f912e879c56bed508;p=ceph.git

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 55135fc00dea..bc0ee7cdc0ca 100644
--- 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 c015e76c29f9..f44c367429e2 100644
--- 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 e3ef936d255e..ad27d5c2ab49 100644
--- 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 81656cba97fa..f0e646a22ef3 100644
--- 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 be8b08e50c5b..5e3fbb2b6b91 100644
--- 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;