From: Dongsheng Yang <dongsheng.yang@easystack.cn>
Date: Thu, 2 Jun 2016 07:47:57 +0000 (-0400)
Subject: tools/rbd: use rbd.create4() for all formats
X-Git-Tag: ses5-milestone5~281^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=666a2e8007edb3f38ba4ebb9001e52be99df7c00;p=ceph.git

tools/rbd: use rbd.create4() for all formats

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
---

diff --git a/src/tools/rbd/action/Create.cc b/src/tools/rbd/action/Create.cc
index dc3bb834d336..0f25c0f5cbab 100644
--- a/src/tools/rbd/action/Create.cc
+++ b/src/tools/rbd/action/Create.cc
@@ -18,23 +18,7 @@ namespace po = boost::program_options;
 static int do_create(librbd::RBD &rbd, librados::IoCtx& io_ctx,
                      const char *imgname, uint64_t size,
 		     librbd::ImageOptions& opts) {
-  int r;
-  uint64_t format;
-  r = opts.get(RBD_IMAGE_OPTION_FORMAT, &format);
-  assert(r == 0);
-  if (format == 1) {
-    uint64_t order;
-    r = opts.get(RBD_IMAGE_OPTION_ORDER, &order);
-    assert(r == 0);
-    int order_ = order;
-    r = rbd.create(io_ctx, imgname, size, &order_);
-  } else {
-    r = rbd.create4(io_ctx, imgname, size, opts);
-  }
-  if (r < 0) {
-    return r;
-  }
-  return 0;
+  return rbd.create4(io_ctx, imgname, size, opts);
 }
 
 void get_arguments(po::options_description *positional,