RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 03:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
This commit is contained in:
Shiyang Ruan 2018-10-30 09:22:27 +08:00
parent 636d05e31a
commit a916342d36
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/rbd_nbd/rbd-nbd.cc
View File

@ -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;
}