]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd-nbd: s/cpp_error/cpp_strerror/ to fix FTBFS
authorKefu Chai <kchai@redhat.com>
Wed, 29 Mar 2017 11:07:34 +0000 (19:07 +0800)
committerNathan Cutler <ncutler@suse.com>
Tue, 4 Jul 2017 08:56:49 +0000 (10:56 +0200)
the build failure was introduced by ff4dcf0

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

src/tools/rbd_nbd/rbd-nbd.cc

index c87ba051a5656d1132f03341bbcdd48dbd8a68a6..465ee9ca065952bbb57d4269bc3d64f09dd8ff6c 100644 (file)
@@ -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;
   }