From: Dongsheng Yang <dongsheng.yang@easystack.cn>
Date: Mon, 11 Jul 2016 11:44:24 +0000 (-0400)
Subject: tools/rbd: use create4() for both of format 1 and format 2.
X-Git-Tag: ses5-milestone5~281^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6264acb4694d8fd1c02be9c38d16a159bb93e7ac;p=ceph.git

tools/rbd: use create4() for both of format 1 and format 2.

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

diff --git a/src/tools/rbd/action/Import.cc b/src/tools/rbd/action/Import.cc
index b69bd48e776a..a935c38b79f8 100644
--- a/src/tools/rbd/action/Import.cc
+++ b/src/tools/rbd/action/Import.cc
@@ -131,28 +131,7 @@ static int do_import(librbd::RBD &rbd, librados::IoCtx& io_ctx,
     posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL);
   }
 
-  uint64_t format;
-  r = opts.get(RBD_IMAGE_OPTION_FORMAT, &format);
-  assert(r == 0);
-  if (format == 1) {
-    uint64_t stripe_unit, stripe_count;
-    r = opts.get(RBD_IMAGE_OPTION_STRIPE_UNIT, &stripe_unit);
-    assert(r == 0);
-    r = opts.get(RBD_IMAGE_OPTION_STRIPE_COUNT, &stripe_count);
-    assert(r == 0);
-
-    // weird striping not allowed with format 1!
-    if ((stripe_unit || stripe_count) &&
-        (stripe_unit != (1ull << order) && stripe_count != 1)) {
-      std::cerr << "non-default striping not allowed with format 1; "
-                << "use --image-format 2" << std::endl;
-      return -EINVAL;
-    }
-    int order_ = order;
-    r = rbd.create(io_ctx, imgname, size, &order_);
-  } else {
-    r = rbd.create4(io_ctx, imgname, size, opts);
-  }
+  r = rbd.create4(io_ctx, imgname, size, opts);
   if (r < 0) {
     std::cerr << "rbd: image creation failed" << std::endl;
     goto done;