From: Sage Weil <sage@redhat.com>
Date: Tue, 3 Apr 2018 15:08:22 +0000 (-0500)
Subject: Merge tag 'v13.0.2'
X-Git-Tag: v13.1.0~420
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=643253c32629df84eaafb04fe59e93c5af9e7e16;p=ceph.git

Merge tag 'v13.0.2'

v13.0.2
---

643253c32629df84eaafb04fe59e93c5af9e7e16
diff --cc src/ceph_fuse.cc
index a6295e2b2d7,916217bead7..f271239493a
--- a/src/ceph_fuse.cc
+++ b/src/ceph_fuse.cc
@@@ -93,21 -100,6 +98,19 @@@ int main(int argc, const char **argv, c
      } else if (ceph_argparse_flag(args, i, "--localize-reads", (char*)nullptr)) {
        cerr << "setting CEPH_OSD_FLAG_LOCALIZE_READS" << std::endl;
        filer_flags |= CEPH_OSD_FLAG_LOCALIZE_READS;
-     } else if (ceph_argparse_flag(args, i, "-h", "--help", (char*)nullptr)) {
-       usage();
 +    } else if (ceph_argparse_flag(args, i, "-V", (char*)nullptr)) {
 +      const char* tmpargv[] = {
 +	"ceph-fuse",
 +	"-V"
 +      };
 +
 +      struct fuse_args fargs = FUSE_ARGS_INIT(2, (char**)tmpargv);
 +      if (fuse_parse_cmdline(&fargs, nullptr, nullptr, nullptr) == -1) {
 +       derr << "fuse_parse_cmdline failed." << dendl;
 +      }
 +      assert(fargs.allocated);
 +      fuse_opt_free_args(&fargs);
 +      exit(0);
      } else {
        ++i;
      }