test/osd: Un-deprecated version of aio_create_completion

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index 2da9125c1fb146caf1a68b6342bb1f536e6afe51..c6a6cd3633cd2c0df62133c26fdd39928a7efa0e 100644 (file)
--- a/src/test/osd/RadosModel.h
+++ b/src/test/osd/RadosModel.h
@@ -634,7 +634,7 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    comp = context->rados.aio_create_completion((void*) cb_arg, NULL,
+    comp = context->rados.aio_create_completion((void*) cb_arg,
                                                &write_callback);
     context->io_ctx.aio_operate(context->prefix+oid, comp, &op);
   }
@@ -724,8 +724,7 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    comp = context->rados.aio_create_completion((void*) cb_arg, NULL,
-                                               &write_callback);
+    comp = context->rados.aio_create_completion((void*) cb_arg, &write_callback);
     context->io_ctx.aio_operate(context->prefix+oid, comp, &op);
   }
 
@@ -847,8 +846,7 @@ public:
        new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                                 new TestOp::CallbackInfo(tid));
       librados::AioCompletion *completion =
-       context->rados.aio_create_completion((void*) cb_arg, NULL,
-                                            &write_callback);
+       context->rados.aio_create_completion((void*) cb_arg, &write_callback);
       waiting.insert(completion);
       librados::ObjectWriteOperation op;
       if (do_append) {
@@ -870,7 +868,7 @@ public:
        this,
        new TestOp::CallbackInfo(++tid));
     librados::AioCompletion *completion = context->rados.aio_create_completion(
-      (void*) cb_arg, NULL, &write_callback);
+      (void*) cb_arg, &write_callback);
     waiting.insert(completion);
     waiting_on++;
     write_op.setxattr("_header", contbl);
@@ -885,7 +883,7 @@ public:
        this,
        new TestOp::CallbackInfo(++tid));
     rcompletion = context->rados.aio_create_completion(
-         (void*) cb_arg, NULL, &write_callback);
+         (void*) cb_arg, &write_callback);
     waiting_on++;
     read_op.read(0, 1, &rbuffer, 0);
     context->io_ctx.aio_operate(
@@ -1028,7 +1026,7 @@ public:
        new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                                 new TestOp::CallbackInfo(tid));
       librados::AioCompletion *completion =
-       context->rados.aio_create_completion((void*) cb_arg, NULL,
+       context->rados.aio_create_completion((void*) cb_arg,
                                             &write_callback);
       waiting.insert(completion);
       librados::ObjectWriteOperation op;
@@ -1047,7 +1045,7 @@ public:
        this,
        new TestOp::CallbackInfo(++tid));
     librados::AioCompletion *completion = context->rados.aio_create_completion(
-      (void*) cb_arg, NULL, &write_callback);
+      (void*) cb_arg, &write_callback);
     waiting.insert(completion);
     waiting_on++;
     write_op.setxattr("_header", contbl);
@@ -1060,7 +1058,7 @@ public:
        this,
        new TestOp::CallbackInfo(++tid));
     rcompletion = context->rados.aio_create_completion(
-         (void*) cb_arg, NULL, &write_callback);
+         (void*) cb_arg, &write_callback);
     waiting_on++;
     read_op.read(0, 1, &rbuffer, 0);
     context->io_ctx.aio_operate(
@@ -1284,7 +1282,7 @@ public:
     std::cout << num << ": read oid " << oid << " snap " << snap << std::endl;
     done = 0;
     for (uint32_t i = 0; i < 3; i++) {
-      completions[i] = context->rados.aio_create_completion((void *) this, &read_callback, 0);
+      completions[i] = context->rados.aio_create_completion((void *) this, &read_callback);
     }
 
     context->oid_in_use.insert(oid);
@@ -1786,7 +1784,7 @@ public:
        new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                                 new TestOp::CallbackInfo(0));
       comps[0] = 
-       context->rados.aio_create_completion((void*) cb_arg, NULL,
+       context->rados.aio_create_completion((void*) cb_arg,
                                             &write_callback);
       context->io_ctx.aio_operate(
        context->prefix+oid, comps[0], &zero_write_op1);
@@ -1796,7 +1794,7 @@ public:
        new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                                 new TestOp::CallbackInfo(1));
       comps[1] =
-       context->rados.aio_create_completion((void*) cb_arg, NULL,
+       context->rados.aio_create_completion((void*) cb_arg,
                                             &write_callback);
       context->io_ctx.aio_operate(
        context->prefix+oid, comps[1], &op);
@@ -1806,7 +1804,7 @@ public:
        new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                                 new TestOp::CallbackInfo(2));
       comps[2] =
-       context->rados.aio_create_completion((void*) cb_arg, NULL,
+       context->rados.aio_create_completion((void*) cb_arg,
                                             &write_callback);
       context->io_ctx.aio_operate(
        context->prefix+oid, comps[2], &zero_write_op2);
@@ -1902,7 +1900,7 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    comp = context->rados.aio_create_completion((void*) cb_arg, NULL,
+    comp = context->rados.aio_create_completion((void*) cb_arg,
                                                &write_callback);
     context->io_ctx.aio_operate(context->prefix+oid, comp, &op);
 
@@ -1910,7 +1908,7 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *read_cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(1));
-    comp_racing_read = context->rados.aio_create_completion((void*) read_cb_arg, NULL, &write_callback);
+    comp_racing_read = context->rados.aio_create_completion((void*) read_cb_arg, &write_callback);
     rd_op.stat(NULL, NULL, NULL);
     context->io_ctx.aio_operate(context->prefix+oid, comp_racing_read, &rd_op,
                                librados::OPERATION_ORDER_READS_WRITES,  // order wrt previous write/update
@@ -2042,7 +2040,7 @@ public:
     std::cout << num << ": chunk read oid " << oid << " snap " << snap << std::endl;
     done = 0;
     for (uint32_t i = 0; i < 2; i++) {
-      completions[i] = context->rados.aio_create_completion((void *) this, &read_callback, 0);
+      completions[i] = context->rados.aio_create_completion((void *) this, &read_callback);
     }
 
     context->find_object(oid, &old_value);
@@ -2244,8 +2242,7 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    comp = context->rados.aio_create_completion((void*) cb_arg, NULL,
-                                               &write_callback);
+    comp = context->rados.aio_create_completion((void*) cb_arg, &write_callback);
     if (tgt_pool_name == context->low_tier_pool_name) {
       context->low_tier_io_ctx.aio_operate(context->prefix+oid, comp, &op);
     } else {
@@ -2340,7 +2337,7 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    comp = context->rados.aio_create_completion((void*) cb_arg, NULL,
+    comp = context->rados.aio_create_completion((void*) cb_arg,
                                                &write_callback);
     context->io_ctx.aio_operate(context->prefix+oid, comp, &op,
                                librados::OPERATION_ORDER_READS_WRITES);
@@ -2515,8 +2512,7 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    comp = context->rados.aio_create_completion((void*) cb_arg, NULL,
-                                               &write_callback);
+    comp = context->rados.aio_create_completion((void*) cb_arg, &write_callback);
     context->io_ctx.aio_operate(context->prefix+oid, comp, &op,
                                librados::OPERATION_ORDER_READS_WRITES);
   }
@@ -2647,7 +2643,7 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    completion = context->rados.aio_create_completion((void *) cb_arg, NULL,
+    completion = context->rados.aio_create_completion((void *) cb_arg,
                                                      &write_callback);
     context->state_lock.unlock();
 
@@ -2717,7 +2713,7 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    completion = context->rados.aio_create_completion((void *) cb_arg, NULL,
+    completion = context->rados.aio_create_completion((void *) cb_arg, 
                                                      &write_callback);
     context->state_lock.unlock();
 
@@ -2780,7 +2776,7 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    comp1 = context->rados.aio_create_completion((void*) cb_arg, NULL,
+    comp1 = context->rados.aio_create_completion((void*) cb_arg,
                                                 &write_callback);
     int r = context->io_ctx.hit_set_list(hash, comp1, &ls);
     ceph_assert(r == 0);
@@ -2801,8 +2797,7 @@ public:
        pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
          new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                                   new TestOp::CallbackInfo(0));
-       comp2 = context->rados.aio_create_completion((void*) cb_arg, NULL,
-                                                    &write_callback);
+       comp2 = context->rados.aio_create_completion((void*) cb_arg, &write_callback);
        r = context->io_ctx.hit_set_get(hash, comp2, p->second, &bl);
        ceph_assert(r == 0);
       }
@@ -2855,7 +2850,7 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    completion = context->rados.aio_create_completion((void *) cb_arg, NULL,
+    completion = context->rados.aio_create_completion((void *) cb_arg,
                                                      &write_callback);
 
     context->oid_in_use.insert(oid);
@@ -2928,7 +2923,7 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    completion = context->rados.aio_create_completion((void *) cb_arg, NULL,
+    completion = context->rados.aio_create_completion((void *) cb_arg,
                                                      &write_callback);
 
     context->oid_in_use.insert(oid);
@@ -3035,7 +3030,7 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    completion = context->rados.aio_create_completion((void *) cb_arg, NULL,
+    completion = context->rados.aio_create_completion((void *) cb_arg,
                                                      &write_callback);
     context->oid_flushing.insert(oid);
     context->oid_not_flushing.erase(oid);
@@ -3128,7 +3123,7 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    completion = context->rados.aio_create_completion((void *) cb_arg, NULL,
+    completion = context->rados.aio_create_completion((void *) cb_arg,
                                                      &write_callback);
     context->state_lock.unlock();