From: xinxin shu <xinxin.shu@intel.com>
Date: Thu, 17 Sep 2015 03:07:47 +0000 (+0800)
Subject: unify order limit
X-Git-Tag: v9.1.0~95^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a1959284f1aebd337f452370d63ccfae925ccc20;p=ceph.git

unify order limit

Fixes: #13124

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 8b9f3b9dc457..aff768ffdc86 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -1164,8 +1164,8 @@ reprotect_and_return_err:
     if (!*order)
       *order = RBD_DEFAULT_OBJ_ORDER;
 
-    if (*order > 64 || *order < 12) {
-      lderr(cct) << "order must be in the range [12, 64]" << dendl;
+    if (*order > 25 || *order < 12) {
+      lderr(cct) << "order must be in the range [12, 25]" << dendl;
       return -EDOM;
     }
 
diff --git a/src/rbd.cc b/src/rbd.cc
index 64094e3c39a4..ff9cf4006453 100755
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -3177,10 +3177,6 @@ int main(int argc, const char **argv)
 	cerr << "rbd: " << err.str() << std::endl;
 	return EXIT_FAILURE;
       }
-      if ((order <= 0) || (order < 12) || (order > 25)) {
-	cerr << "rbd: order must be between 12 (4 KB) and 25 (32 MB)" << std::endl;
-	return EXIT_FAILURE;
-      }
     } else if (ceph_argparse_witharg(args, i, &val, err, "--io-size", (char*)NULL)) {
       if (!err.str().empty()) {
 	cerr << "rbd: " << err.str() << std::endl;