rbd: updated the 'rbd --help'

Now default format is 2. update 'rbd --help'.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

diff --git a/src/rbd.cc b/src/rbd.cc
index f43512cde613fdd4fe589aa4a32467508827eea7..2d46bea0af2aea0bb7d774273d9038485c35ba30 100644 (file)
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -168,8 +168,8 @@ void usage()
 "  --order <bits>                     the object size in bits; object size will be\n"
 "                                     (1 << order) bytes. Default is 22 (4 MB).\n"
 "  --image-format <format-number>     format to use when creating an image\n"
-"                                     format 1 is the original format (default)\n"
-"                                     format 2 supports cloning\n"
+"                                     format 1 is the original format\n"
+"                                     format 2 supports cloning (default)\n"
 "  --image-feature <feature>          optional format 2 feature to enable.\n"
 "                                     use multiple times to enable multiple features\n"
 "  --image-shared                     image will be used concurrently (disables\n"
@@ -2753,7 +2753,7 @@ int main(int argc, const char **argv)
   int order = 0;
   bool format_specified = false,
     output_format_specified = false;
-  int format = 1;
+  int format = 2;
 
   uint64_t features = 0;
   bool shared = false;

diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index 4556ed7079c2923ce8fd8abd47d8d5c64de718e2..7ec32e997ee5b86b07b581067090edee3efc17c0 100644 (file)
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -80,8 +80,8 @@
     --order <bits>                     the object size in bits; object size will be
                                        (1 << order) bytes. Default is 22 (4 MB).
     --image-format <format-number>     format to use when creating an image
-                                       format 1 is the original format (default)
-                                       format 2 supports cloning
+                                       format 1 is the original format
+                                       format 2 supports cloning (default)
     --image-feature <feature>          optional format 2 feature to enable.
                                        use multiple times to enable multiple features
     --image-shared                     image will be used concurrently (disables