From: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
Date: Tue, 30 Oct 2018 01:22:27 +0000 (+0800)
Subject: rbd-nbd: do not ceph_abort() after print the usages.
X-Git-Tag: v13.2.3~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24988%2Fhead;p=ceph.git

rbd-nbd: do not ceph_abort() after print the usages.

Fixes: http://tracker.ceph.com/issues/36660

Signed-off-by: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
(cherry picked from commit a916342d36214f0de785d2ebf8852c47e2fa5b27)
---

diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
index 16e408b4c1d..08a4b6f1b81 100644
--- a/src/tools/rbd_nbd/rbd-nbd.cc
+++ b/src/tools/rbd_nbd/rbd-nbd.cc
@@ -1164,12 +1164,11 @@ static int rbd_nbd(int argc, const char *argv[])
   r = parse_args(args, &err_msg, &cmd, &cfg);
   if (r == HELP_INFO) {
     usage();
-    ceph_abort();
+    return 0;
   } else if (r == VERSION_INFO) {
     std::cout << pretty_version_to_str() << std::endl;
     return 0;
-  }
-  else if (r < 0) {
+  } else if (r < 0) {
     cerr << err_msg.str() << std::endl;
     return r;
   }
@@ -1197,7 +1196,6 @@ static int rbd_nbd(int argc, const char *argv[])
       break;
     default:
       usage();
-      ceph_abort();
       break;
   }