rbd-nbd: set reply error properly

Signed-off-by: Mykola Golub <mgolub@mirantis.com>

diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
index 0afa444387ddb5f30e6dcd6680fdc7d67b75b053..ff12f91d772f5ca043aeb54146307a68a96470e5 100644 (file)
--- a/src/tools/rbd_nbd/rbd-nbd.cc
+++ b/src/tools/rbd_nbd/rbd-nbd.cc
@@ -170,9 +170,15 @@ private:
 
     dout(20) << __func__ << ": " << *ctx << dendl;
 
-    if (ret > 0)
-      ret = 0;
-    ctx->reply.error = htonl(ret);
+    if (ret < 0) {
+      ctx->reply.error = htonl(-ret);
+    } else if (ret != static_cast<int>(ctx->request.len)) {
+      derr << __func__ << ": " << *ctx << ": unexpected return value: " << ret
+          << " (" << ctx->request.len << " expected)" << dendl;
+      ctx->reply.error = htonl(EIO);
+    } else {
+      ctx->reply.error = htonl(0);
+    }
     ctx->server->io_finish(ctx);
 
     aio_completion->release();