RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-31 15:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16254 from TsaiJin/wip-rbd-nbd-version

Browse Source 
tools/rbd_nbd: add --version show support

Reviewed-by: Jos Collin <jcollin@redhat.com>
This commit is contained in:
Jos Collin 2017-07-12 08:56:44 +00:00 committed by GitHub
commit 82e85a6d86
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,7 @@
#include "common/TextTable.h"
#include "common/ceph_argparse.h"
#include "common/Preforker.h"
#include "common/version.h"
#include "global/global_init.h"
#include "global/signal_handler.h"
@ -99,6 +100,9 @@ static enum {
#define RBD_NBD_BLKSIZE 512UL
#define HELP_INFO 1
#define VERSION_INFO 2
#ifdef CEPH_BIG_ENDIAN
#define ntohll(a) (a)
#elif defined(CEPH_LITTLE_ENDIAN)
@ -931,7 +935,9 @@ static int parse_args(vector<const char*>& args, std::ostream *err_msg, Config *
for (i = args.begin(); i != args.end(); ) {
if (ceph_argparse_flag(args, i, "-h", "--help", (char*)NULL)) {
return -ENODATA;
return HELP_INFO;
} else if (ceph_argparse_flag(args, i, "-v", "--version", (char*)NULL)) {
return VERSION_INFO;
} else if (ceph_argparse_witharg(args, i, &cfg->devpath, "--device", (char *)NULL)) {
} else if (ceph_argparse_witharg(args, i, &cfg->nbds_max, err, "--nbds_max", (char *)NULL)) {
if (!err.str().empty()) {
@ -1020,10 +1026,14 @@ static int rbd_nbd(int argc, const char *argv[])
std::ostringstream err_msg;
r = parse_args(args, &err_msg, &cfg);
if (r == -ENODATA) {
if (r == HELP_INFO) {
usage();
return 0;
} else if (r < 0) {
} else if (r == VERSION_INFO) {
std::cout << pretty_version_to_str() << std::endl;
return 0;
}
else if (r < 0) {
cerr << err_msg.str() << std::endl;
return r;
}