From: Kefu Chai <kchai@redhat.com>
Date: Wed, 29 Mar 2017 11:07:34 +0000 (+0800)
Subject: rbd-nbd: s/cpp_error/cpp_strerror/ to fix FTBFS
X-Git-Tag: v11.2.1~101^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=36e2199f0bfd869054506476f64af7f603ee6541;p=ceph.git

rbd-nbd: s/cpp_error/cpp_strerror/ to fix FTBFS

the build failure was introduced by ff4dcf0

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit c12ecd984df0f9ac0d7de81b9d689f6182a3646a)
---

diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
index c87ba051a5656..465ee9ca06595 100644
--- a/src/tools/rbd_nbd/rbd-nbd.cc
+++ b/src/tools/rbd_nbd/rbd-nbd.cc
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <assert.h>
 
 #include <linux/nbd.h>
 #include <linux/fs.h>
@@ -93,7 +92,7 @@ static void handle_signal(int signum)
   derr << "*** Got signal " << sig_str(signum) << " ***" << dendl;
   dout(20) << __func__ << ": " << "sending NBD_DISCONNECT" << dendl;
   if (ioctl(nbd, NBD_DISCONNECT) < 0) {
-    derr << "rbd-nbd: disconnect failed: " << cpp_error(errno) << std::endl;
+    derr << "rbd-nbd: disconnect failed: " << cpp_strerror(errno) << dendl;
   } else {
     dout(20) << __func__ << ": " << "disconnected" << dendl;
   }