librbd: AioRequest::send no longer returns a result

The librados calls used by AioRequest::send should always return
zero unless there is a bug.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c77bce3)

Conflicts:
	src/librbd/AioRequest.cc: trivial resolution
	src/librbd/AsyncFlattenRequest.cc: trivial resolution

src/librbd/AioRequest.cc

@@ -231,13 +231,14 @@ namespace librbd {
     return finished;
   }
 
-  int AioRead::send() {
-    ldout(m_ictx->cct, 20) << "send " << this << " " << m_oid << " " << m_object_off << "~" << m_object_len << dendl;
+  void AioRead::send() {
+    ldout(m_ictx->cct, 20) << "send " << this << " " << m_oid << " "
+                           << m_object_off << "~" << m_object_len << dendl;
 
     // send read request to parent if the object doesn't exist locally
     if (!m_ictx->object_map.object_may_exist(m_object_no)) {
       complete(-ENOENT);
-      return 0;
+      return;
     }
 
     librados::AioCompletion *rados_completion =
@@ -254,8 +255,9 @@ namespace librbd {
     op.set_op_flags2(m_op_flags);
 
     r = m_ictx->data_ctx.aio_operate(m_oid, rados_completion, &op, flags, NULL);
+    assert(r == 0);
+
     rados_completion->release();
-    return r;
   }
 
   /** write **/
@@ -434,16 +436,13 @@ namespace librbd {
     return finished;
   }
 
-  int AbstractWrite::send() {
+  void AbstractWrite::send() {
     ldout(m_ictx->cct, 20) << "send " << this << " " << m_oid << " "
 			   << m_object_off << "~" << m_object_len << dendl;
 
-    if (send_pre()) {
-      return 0;
-    } else {
+    if (!send_pre()) {
       send_write();
     }
-    return 0;
   }
 
   bool AbstractWrite::send_pre() {

src/librbd/AioRequest.h

@@ -37,7 +37,7 @@ namespace librbd {
     void complete(int r);
 
     virtual bool should_complete(int r) = 0;
-    virtual int send() = 0;
+    virtual void send() = 0;
 
   protected:
     void read_from_parent(vector<pair<uint64_t,uint64_t> >& image_extents,
@@ -63,7 +63,7 @@ namespace librbd {
 	    Context *completion, int op_flags);
     virtual ~AioRead() {}
     virtual bool should_complete(int r);
-    virtual int send();
+    virtual void send();
     void guard_read();
 
     ceph::bufferlist &data() {
@@ -118,7 +118,7 @@ namespace librbd {
 		  bool hide_enoent);
     virtual ~AbstractWrite() {}
     virtual bool should_complete(int r);
-    virtual int send();
+    virtual void send();
 
     bool has_parent() const {
       return !m_object_image_extents.empty();

src/librbd/AsyncFlattenRequest.cc

@@ -71,8 +71,7 @@ class AsyncFlattenObjectContext : public C_AsyncObjectThrottle {
     AioWrite *req = new AioWrite(&m_image_ctx, oid, m_object_no, 0, objectx,
                                  object_overlap, bl, m_snapc, CEPH_NOSNAP,
                                  this);
-    int r = req->send();
-    assert(r == 0);
+    req->send();
     return 0;
   }
 

src/librbd/AsyncTrimRequest.cc

@@ -289,12 +289,7 @@ bool AsyncTrimRequest::send_clean_boundary() {
                                 objectx, object_overlap, snapc, CEPH_NOSNAP,
                                 req_comp);
         }
-        int r = req->send();
-        if (r < 0) {
-          req_comp->complete(r);
-          delete req;
-          break;
-        }
+        req->send();
       }
     }
 

src/librbd/internal.cc

@@ -3371,8 +3371,7 @@ int invoke_async_request(ImageCtx *ictx, const std::string& request_type,
 	c->add_request();
 
 	req->set_op_flags(op_flags);
-	r = req->send();
-        assert(r == 0);
+	req->send();
       }
     }
 
@@ -3472,8 +3471,7 @@ int invoke_async_request(ImageCtx *ictx, const std::string& request_type,
 			  snapc, snap_id, req_comp);
       }
 
-      r = req->send();
-      assert(r == 0);
+      req->send();
     }
 
     if (ictx->object_cacher) {
@@ -3639,8 +3637,7 @@ int invoke_async_request(ImageCtx *ictx, const std::string& request_type,
 				    q->length, q->offset,
 				    cache_comp, op_flags);
 	} else {
-	  r = req->send();
-          assert(r == 0);
+	  req->send();
 	}
       }
     }