librados: eliminiate ack vs commit distinction

- paper over the distinction in the public interface
- consolidate internal completions and flags

Signed-off-by: Sage Weil <sage@redhat.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/src/libradosstriper/RadosStriperImpl.cc b/src/libradosstriper/RadosStriperImpl.cc
index 2816f57c090..dc9cb71a6c9 100644
--- a/src/libradosstriper/RadosStriperImpl.cc
+++ b/src/libradosstriper/RadosStriperImpl.cc
@@ -125,7 +125,7 @@ libradosstriper::RadosStriperImpl::CompletionData::CompletionData
   m_striper(striper), m_soid(soid), m_lockCookie(lockCookie), m_ack(0) {
   m_striper->get();
   if (userCompletion) {
-    m_ack = new librados::IoCtxImpl::C_aio_Ack(userCompletion);
+    m_ack = new librados::IoCtxImpl::C_aio_Complete(userCompletion);
     userCompletion->io = striper->m_ioCtxImpl;
   }
 }
@@ -188,7 +188,7 @@ libradosstriper::RadosStriperImpl::WriteCompletionData::WriteCompletionData
   CompletionData(striper, soid, lockCookie, userCompletion, n), m_safe(0),
   m_unlockCompletion(0) {
   if (userCompletion) {
-    m_safe = new librados::IoCtxImpl::C_aio_Safe(userCompletion);
+    m_safe = new librados::IoCtxImpl::C_aio_Complete(userCompletion);
   }
 }
 
diff --git a/src/libradosstriper/RadosStriperImpl.h b/src/libradosstriper/RadosStriperImpl.h
index 215d0ee98b6..f6d74822698 100644
--- a/src/libradosstriper/RadosStriperImpl.h
+++ b/src/libradosstriper/RadosStriperImpl.h
@@ -52,7 +52,7 @@ struct libradosstriper::RadosStriperImpl {
     /// shared lock to be released at completion
     std::string m_lockCookie;
     /// completion handler
-    librados::IoCtxImpl::C_aio_Ack *m_ack;
+    librados::IoCtxImpl::C_aio_Complete *m_ack;
   };
 
   /**
@@ -93,7 +93,7 @@ struct libradosstriper::RadosStriperImpl {
    */
   struct WriteCompletionData : CompletionData {
     /// safe completion handler
-    librados::IoCtxImpl::C_aio_Safe *m_safe;
+    librados::IoCtxImpl::C_aio_Complete *m_safe;
     /// return code of write completion, to be remembered until unlocking happened
     int m_writeRc;
     /// completion object for the unlocking of the striped object at the end of the write