]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd-nbd: invalid error code for "failed to read nbd request" messages 12756/head
authorMykola Golub <mgolub@mirantis.com>
Tue, 13 Dec 2016 16:54:17 +0000 (18:54 +0200)
committerAbhishek Varshney <abhishek.varshney@flipkart.com>
Tue, 3 Jan 2017 08:55:59 +0000 (14:25 +0530)
Fixes: http://tracker.ceph.com/issues/18242
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 42c2514fe22d34e1bd5a5d2686e06f7e01b7c0c3)

src/tools/rbd_nbd/rbd-nbd.cc

index dd5ace59ffc3eb26a6474432982d199dcb4486b5..1876dda32661c0c0ff0e72bc74cde540b263d822 100644 (file)
@@ -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);