From: Pan Liu <pan.liu@istuary.com>
Date: Thu, 9 Mar 2017 12:58:26 +0000 (+0800)
Subject: librados: replace the var name from onact to oncomplete.
X-Git-Tag: v12.0.1~110^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F13857%2Fhead;p=ceph.git

librados: replace the var name from onact to oncomplete.

Signed-off-by: Pan Liu <pan.liu@istuary.com>
---

diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc
index 49cf05faa7f1..cfdb4089eee0 100644
--- a/src/librados/IoCtxImpl.cc
+++ b/src/librados/IoCtxImpl.cc
@@ -772,17 +772,17 @@ int librados::IoCtxImpl::aio_operate_read(const object_t &oid,
 					  bufferlist *pbl)
 {
   FUNCTRACE();
-  Context *onack = new C_aio_Complete(c);
+  Context *oncomplete = new C_aio_Complete(c);
 
 #if defined(WITH_LTTNG) && defined(WITH_EVENTTRACE)
-  ((C_aio_Complete *) onack)->oid = oid;
+  ((C_aio_Complete *) oncomplete)->oid = oid;
 #endif
   c->is_read = true;
   c->io = this;
 
   Objecter::Op *objecter_op = objecter->prepare_read_op(oid, oloc,
 		 *o, snap_seq, pbl, flags,
-		 onack, &c->objver);
+		 oncomplete, &c->objver);
   objecter->op_submit(objecter_op, &c->tid);
   return 0;
 }
@@ -798,9 +798,9 @@ int librados::IoCtxImpl::aio_operate(const object_t& oid,
   if (snap_seq != CEPH_NOSNAP)
     return -EROFS;
 
-  Context *onack = new C_aio_Complete(c);
+  Context *oncomplete = new C_aio_Complete(c);
 #if defined(WITH_LTTNG) && defined(WITH_EVENTTRACE)
-  ((C_aio_Complete *) onack)->oid = oid;
+  ((C_aio_Complete *) oncomplete)->oid = oid;
 #endif
 
   c->io = this;
@@ -808,7 +808,7 @@ int librados::IoCtxImpl::aio_operate(const object_t& oid,
 
   Objecter::Op *op = objecter->prepare_mutate_op(
     oid, oloc, *o, snap_context, ut, flags,
-    onack, &c->objver);
+    oncomplete, &c->objver);
   objecter->op_submit(op, &c->tid);
 
   return 0;
@@ -823,10 +823,10 @@ int librados::IoCtxImpl::aio_read(const object_t oid, AioCompletionImpl *c,
     return -EDOM;
 
   OID_EVENT_TRACE(oid.name.c_str(), "RADOS_READ_OP_BEGIN");
-  Context *onack = new C_aio_Complete(c);
+  Context *oncomplete = new C_aio_Complete(c);
 
 #if defined(WITH_LTTNG) && defined(WITH_EVENTTRACE)
-  ((C_aio_Complete *) onack)->oid = oid;
+  ((C_aio_Complete *) oncomplete)->oid = oid;
 #endif
   c->is_read = true;
   c->io = this;
@@ -835,7 +835,7 @@ int librados::IoCtxImpl::aio_read(const object_t oid, AioCompletionImpl *c,
   Objecter::Op *o = objecter->prepare_read_op(
     oid, oloc,
     off, len, snapid, pbl, 0,
-    onack, &c->objver);
+    oncomplete, &c->objver);
   objecter->op_submit(o, &c->tid);
   return 0;
 }
@@ -849,10 +849,10 @@ int librados::IoCtxImpl::aio_read(const object_t oid, AioCompletionImpl *c,
     return -EDOM;
 
   OID_EVENT_TRACE(oid.name.c_str(), "RADOS_READ_OP_BEGIN");
-  Context *onack = new C_aio_Complete(c);
+  Context *oncomplete = new C_aio_Complete(c);
 
 #if defined(WITH_LTTNG) && defined(WITH_EVENTTRACE)
-  ((C_aio_Complete *) onack)->oid = oid;
+  ((C_aio_Complete *) oncomplete)->oid = oid;
 #endif
   c->is_read = true;
   c->io = this;
@@ -864,7 +864,7 @@ int librados::IoCtxImpl::aio_read(const object_t oid, AioCompletionImpl *c,
   Objecter::Op *o = objecter->prepare_read_op(
     oid, oloc,
     off, len, snapid, &c->bl, 0,
-    onack, &c->objver);
+    oncomplete, &c->objver);
   objecter->op_submit(o, &c->tid);
   return 0;
 }
@@ -924,10 +924,10 @@ int librados::IoCtxImpl::aio_write(const object_t &oid, AioCompletionImpl *c,
   if (snap_seq != CEPH_NOSNAP)
     return -EROFS;
 
-  Context *onack = new C_aio_Complete(c);
+  Context *oncomplete = new C_aio_Complete(c);
 
 #if defined(WITH_LTTNG) && defined(WITH_EVENTTRACE)
-  ((C_aio_Complete *) onack)->oid = oid;
+  ((C_aio_Complete *) oncomplete)->oid = oid;
 #endif
   c->io = this;
   queue_aio_write(c);
@@ -935,7 +935,7 @@ int librados::IoCtxImpl::aio_write(const object_t &oid, AioCompletionImpl *c,
   Objecter::Op *o = objecter->prepare_write_op(
     oid, oloc,
     off, len, snapc, bl, ut, 0,
-    onack, &c->objver);
+    oncomplete, &c->objver);
   objecter->op_submit(o, &c->tid);
 
   return 0;
@@ -953,9 +953,9 @@ int librados::IoCtxImpl::aio_append(const object_t &oid, AioCompletionImpl *c,
   if (snap_seq != CEPH_NOSNAP)
     return -EROFS;
 
-  Context *onack = new C_aio_Complete(c);
+  Context *oncomplete = new C_aio_Complete(c);
 #if defined(WITH_LTTNG) && defined(WITH_EVENTTRACE)
-  ((C_aio_Complete *) onack)->oid = oid;
+  ((C_aio_Complete *) oncomplete)->oid = oid;
 #endif
 
   c->io = this;
@@ -964,7 +964,7 @@ int librados::IoCtxImpl::aio_append(const object_t &oid, AioCompletionImpl *c,
   Objecter::Op *o = objecter->prepare_append_op(
     oid, oloc,
     len, snapc, bl, ut, 0,
-    onack, &c->objver);
+    oncomplete, &c->objver);
   objecter->op_submit(o, &c->tid);
 
   return 0;
@@ -983,9 +983,9 @@ int librados::IoCtxImpl::aio_write_full(const object_t &oid,
   if (snap_seq != CEPH_NOSNAP)
     return -EROFS;
 
-  Context *onack = new C_aio_Complete(c);
+  Context *oncomplete = new C_aio_Complete(c);
 #if defined(WITH_LTTNG) && defined(WITH_EVENTTRACE)
-  ((C_aio_Complete *) onack)->oid = oid;
+  ((C_aio_Complete *) oncomplete)->oid = oid;
 #endif
 
   c->io = this;
@@ -994,7 +994,7 @@ int librados::IoCtxImpl::aio_write_full(const object_t &oid,
   Objecter::Op *o = objecter->prepare_write_full_op(
     oid, oloc,
     snapc, bl, ut, 0,
-    onack, &c->objver);
+    oncomplete, &c->objver);
   objecter->op_submit(o, &c->tid);
 
   return 0;
@@ -1017,10 +1017,10 @@ int librados::IoCtxImpl::aio_writesame(const object_t &oid,
   if (snap_seq != CEPH_NOSNAP)
     return -EROFS;
 
-  Context *onack = new C_aio_Complete(c);
+  Context *oncomplete = new C_aio_Complete(c);
 
 #if defined(WITH_LTTNG) && defined(WITH_EVENTTRACE)
-  ((C_aio_Complete *) onack)->oid = oid;
+  ((C_aio_Complete *) oncomplete)->oid = oid;
 #endif
   c->io = this;
   queue_aio_write(c);
@@ -1029,7 +1029,7 @@ int librados::IoCtxImpl::aio_writesame(const object_t &oid,
     oid, oloc,
     write_len, off,
     snapc, bl, ut, 0,
-    onack, &c->objver);
+    oncomplete, &c->objver);
   objecter->op_submit(o, &c->tid);
 
   return 0;
@@ -1044,10 +1044,10 @@ int librados::IoCtxImpl::aio_remove(const object_t &oid, AioCompletionImpl *c, i
   if (snap_seq != CEPH_NOSNAP)
     return -EROFS;
 
-  Context *onack = new C_aio_Complete(c);
+  Context *oncomplete = new C_aio_Complete(c);
 
 #if defined(WITH_LTTNG) && defined(WITH_EVENTTRACE)
-  ((C_aio_Complete *) onack)->oid = oid;
+  ((C_aio_Complete *) oncomplete)->oid = oid;
 #endif
   c->io = this;
   queue_aio_write(c);
@@ -1055,7 +1055,7 @@ int librados::IoCtxImpl::aio_remove(const object_t &oid, AioCompletionImpl *c, i
   Objecter::Op *o = objecter->prepare_remove_op(
     oid, oloc,
     snapc, ut, flags,
-    onack, &c->objver);
+    oncomplete, &c->objver);
   objecter->op_submit(o, &c->tid);
 
   return 0;
@@ -1168,7 +1168,7 @@ int librados::IoCtxImpl::aio_cancel(AioCompletionImpl *c)
 int librados::IoCtxImpl::hit_set_list(uint32_t hash, AioCompletionImpl *c,
 			      std::list< std::pair<time_t, time_t> > *pls)
 {
-  Context *onack = new C_aio_Complete(c);
+  Context *oncomplete = new C_aio_Complete(c);
   c->is_read = true;
   c->io = this;
 
@@ -1176,7 +1176,7 @@ int librados::IoCtxImpl::hit_set_list(uint32_t hash, AioCompletionImpl *c,
   rd.hit_set_ls(pls, NULL);
   object_locator_t oloc(poolid);
   Objecter::Op *o = objecter->prepare_pg_read_op(
-    hash, oloc, rd, NULL, 0, onack, NULL, NULL);
+    hash, oloc, rd, NULL, 0, oncomplete, NULL, NULL);
   objecter->op_submit(o, &c->tid);
   return 0;
 }
@@ -1185,7 +1185,7 @@ int librados::IoCtxImpl::hit_set_get(uint32_t hash, AioCompletionImpl *c,
 				     time_t stamp,
 				     bufferlist *pbl)
 {
-  Context *onack = new C_aio_Complete(c);
+  Context *oncomplete = new C_aio_Complete(c);
   c->is_read = true;
   c->io = this;
 
@@ -1193,7 +1193,7 @@ int librados::IoCtxImpl::hit_set_get(uint32_t hash, AioCompletionImpl *c,
   rd.hit_set_get(ceph::real_clock::from_time_t(stamp), pbl, 0);
   object_locator_t oloc(poolid);
   Objecter::Op *o = objecter->prepare_pg_read_op(
-    hash, oloc, rd, NULL, 0, onack, NULL, NULL);
+    hash, oloc, rd, NULL, 0, oncomplete, NULL, NULL);
   objecter->op_submit(o, &c->tid);
   return 0;
 }
@@ -1229,7 +1229,7 @@ int librados::IoCtxImpl::get_inconsistent_objects(const pg_t& pg,
 						  std::vector<inconsistent_obj_t>* objects,
 						  uint32_t* interval)
 {
-  Context *onack = new C_aio_Complete(c);
+  Context *oncomplete = new C_aio_Complete(c);
   c->is_read = true;
   c->io = this;
 
@@ -1237,7 +1237,7 @@ int librados::IoCtxImpl::get_inconsistent_objects(const pg_t& pg,
   op.scrub_ls(start_after, max_to_get, objects, interval, nullptr);
   object_locator_t oloc{poolid, pg.ps()};
   Objecter::Op *o = objecter->prepare_pg_read_op(
-    oloc.hash, oloc, op, nullptr, CEPH_OSD_FLAG_PGOP, onack,
+    oloc.hash, oloc, op, nullptr, CEPH_OSD_FLAG_PGOP, oncomplete,
     nullptr, nullptr);
   objecter->op_submit(o, &c->tid);
   return 0;
@@ -1250,7 +1250,7 @@ int librados::IoCtxImpl::get_inconsistent_snapsets(const pg_t& pg,
 						   std::vector<inconsistent_snapset_t>* snapsets,
 						   uint32_t* interval)
 {
-  Context *onack = new C_aio_Complete(c);
+  Context *oncomplete = new C_aio_Complete(c);
   c->is_read = true;
   c->io = this;
 
@@ -1258,7 +1258,7 @@ int librados::IoCtxImpl::get_inconsistent_snapsets(const pg_t& pg,
   op.scrub_ls(start_after, max_to_get, snapsets, interval, nullptr);
   object_locator_t oloc{poolid, pg.ps()};
   Objecter::Op *o = objecter->prepare_pg_read_op(
-    oloc.hash, oloc, op, nullptr, CEPH_OSD_FLAG_PGOP, onack,
+    oloc.hash, oloc, op, nullptr, CEPH_OSD_FLAG_PGOP, oncomplete,
     nullptr, nullptr);
   objecter->op_submit(o, &c->tid);
   return 0;
@@ -1311,10 +1311,10 @@ int librados::IoCtxImpl::aio_exec(const object_t& oid, AioCompletionImpl *c,
 				  bufferlist& inbl, bufferlist *outbl)
 {
   FUNCTRACE();
-  Context *onack = new C_aio_Complete(c);
+  Context *oncomplete = new C_aio_Complete(c);
 
 #if defined(WITH_LTTNG) && defined(WITH_EVENTTRACE)
-  ((C_aio_Complete *) onack)->oid = oid;
+  ((C_aio_Complete *) oncomplete)->oid = oid;
 #endif
   c->is_read = true;
   c->io = this;
@@ -1323,7 +1323,7 @@ int librados::IoCtxImpl::aio_exec(const object_t& oid, AioCompletionImpl *c,
   prepare_assert_ops(&rd);
   rd.call(cls, method, inbl);
   Objecter::Op *o = objecter->prepare_read_op(
-    oid, oloc, rd, snap_seq, outbl, 0, onack, &c->objver);
+    oid, oloc, rd, snap_seq, outbl, 0, oncomplete, &c->objver);
   objecter->op_submit(o, &c->tid);
   return 0;
 }
@@ -1333,10 +1333,10 @@ int librados::IoCtxImpl::aio_exec(const object_t& oid, AioCompletionImpl *c,
 				  bufferlist& inbl, char *buf, size_t out_len)
 {
   FUNCTRACE();
-  Context *onack = new C_aio_Complete(c);
+  Context *oncomplete = new C_aio_Complete(c);
 
 #if defined(WITH_LTTNG) && defined(WITH_EVENTTRACE)
-  ((C_aio_Complete *) onack)->oid = oid;
+  ((C_aio_Complete *) oncomplete)->oid = oid;
 #endif
   c->is_read = true;
   c->io = this;
@@ -1349,7 +1349,7 @@ int librados::IoCtxImpl::aio_exec(const object_t& oid, AioCompletionImpl *c,
   prepare_assert_ops(&rd);
   rd.call(cls, method, inbl);
   Objecter::Op *o = objecter->prepare_read_op(
-    oid, oloc, rd, snap_seq, &c->bl, 0, onack, &c->objver);
+    oid, oloc, rd, snap_seq, &c->bl, 0, oncomplete, &c->objver);
   objecter->op_submit(o, &c->tid);
   return 0;
 }