From: Mykola Golub <mgolub@mirantis.com>
Date: Sun, 15 Nov 2015 19:37:44 +0000 (+0200)
Subject: rbd: stripe unit/count set incorrectly from config
X-Git-Tag: v10.0.1~57^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08fd09a856bfac3ba3a53fc68168b2fac9ffdadf;p=ceph.git

rbd: stripe unit/count set incorrectly from config

(after rbd-refactor fixup)

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/tools/rbd/Utils.cc b/src/tools/rbd/Utils.cc
index 5d6e322813b2..02af9ef1f885 100644
--- a/src/tools/rbd/Utils.cc
+++ b/src/tools/rbd/Utils.cc
@@ -226,13 +226,13 @@ int get_image_options(const boost::program_options::variables_map &vm,
   if (vm.count(at::IMAGE_STRIPE_UNIT)) {
     *stripe_unit = vm[at::IMAGE_STRIPE_UNIT].as<uint32_t>();
   } else {
-    *stripe_unit = g_conf->rbd_default_stripe_count;
+    *stripe_unit = g_conf->rbd_default_stripe_unit;
   }
 
   if (vm.count(at::IMAGE_STRIPE_COUNT)) {
     *stripe_count = vm[at::IMAGE_STRIPE_COUNT].as<uint32_t>();
   } else {
-    *stripe_count = g_conf->rbd_default_stripe_unit;
+    *stripe_count = g_conf->rbd_default_stripe_count;
   }
 
   if ((*stripe_unit != 0 && *stripe_count == 0) ||