From a916342d36214f0de785d2ebf8852c47e2fa5b27 Mon Sep 17 00:00:00 2001 From: Shiyang Ruan Date: Tue, 30 Oct 2018 09:22:27 +0800 Subject: [PATCH] rbd-nbd: do not ceph_abort() after print the usages. Fixes: http://tracker.ceph.com/issues/36660 Signed-off-by: Shiyang Ruan --- src/tools/rbd_nbd/rbd-nbd.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc index 1f2e72c0cdb00..1dbe7e00f6d6d 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; } -- 2.39.5