RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-12 06:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24815 from iridescent-rsy/remove-ceph_abort

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

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2018-11-06 11:11:09 -05:00 committed by GitHub
commit ea4411f9a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;
}