From: Mykola Golub <mgolub@mirantis.com>
Date: Tue, 13 Dec 2016 16:54:17 +0000 (+0200)
Subject: rbd-nbd: invalid error code for "failed to read nbd request" messages
X-Git-Tag: v10.2.6~133^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=944ec0348e5b4cd69c8aedda833cf5e468a98dc9;p=ceph.git

rbd-nbd: invalid error code for "failed to read nbd request" messages

Fixes: http://tracker.ceph.com/issues/18242
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 42c2514fe22d34e1bd5a5d2686e06f7e01b7c0c3)
---

diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
index dd5ace59ffc3e..1876dda32661c 100644
--- a/src/tools/rbd_nbd/rbd-nbd.cc
+++ b/src/tools/rbd_nbd/rbd-nbd.cc
@@ -219,7 +219,7 @@ private:
 
       int r = safe_read_exact(fd, &ctx->request, sizeof(struct nbd_request));
       if (r < 0) {
-	derr << "failed to read nbd request header: " << cpp_strerror(errno)
+	derr << "failed to read nbd request header: " << cpp_strerror(r)
 	     << dendl;
 	return;
       }
@@ -251,7 +251,7 @@ private:
 	  r = safe_read_exact(fd, ptr.c_str(), ctx->request.len);
           if (r < 0) {
 	    derr << *ctx << ": failed to read nbd request data: "
-		 << cpp_strerror(errno) << dendl;
+		 << cpp_strerror(r) << dendl;
             return;
 	  }
           ctx->data.push_back(ptr);