From: Samuel Just <sam.just@inktank.com>
Date: Tue, 24 Jun 2014 17:11:21 +0000 (-0700)
Subject: rados.cc: fix pool alignment check
X-Git-Tag: v0.83~61^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d7350a3741bf4cdb270c6361e68090fe280cf36d;p=ceph.git

rados.cc: fix pool alignment check

Only check pool alignment if io_ctx is initialized.

Introduced in 304b08a23a3db57010078046955a786fe3589ef8
Fixes: #8652
Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index 85a498b1918e2..807b660b3f13d 100644
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -1359,15 +1359,15 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
 	   << cpp_strerror(ret) << std::endl;
       goto out;
     }
-  }
 
-  // align op_size
-  if (io_ctx.pool_requires_alignment()) {
-    const uint64_t align = io_ctx.pool_required_alignment();
-    const bool wrn = (op_size != (1<<22));
-    op_size = uint64_t((op_size + align - 1) / align) * align;
-    if (wrn)
-      cerr << "INFO: op_size has been rounded to " << op_size << std::endl;
+    // align op_size
+    if (io_ctx.pool_requires_alignment()) {
+      const uint64_t align = io_ctx.pool_required_alignment();
+      const bool wrn = (op_size != (1<<22));
+      op_size = uint64_t((op_size + align - 1) / align) * align;
+      if (wrn)
+	cerr << "INFO: op_size has been rounded to " << op_size << std::endl;
+    }
   }
 
   // snapname?