From: Sage Weil <sage@redhat.com>
Date: Sun, 3 Aug 2014 15:40:57 +0000 (-0700)
Subject: Revert "enforce rados put aligment"
X-Git-Tag: v0.80.6~109
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e03d5b512c8d2f7fa51dda95c6132e676529f9b;p=ceph.git

Revert "enforce rados put aligment"

This reverts commit 7a58da53ebfcaaf385c21403b654d1d2f1508e1a.

This was alread backported in dece65064d949b5afcc359cd408615883b5e002a.

Fixes: #8996
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index 7249d5eef6b..bd71433e8dc 100644
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -1370,15 +1370,6 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
     }
   }
 
-  // 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 << "WARNING: op_size has been rounded to " << op_size << std::endl;
-  }
-
   // snapname?
   if (snapname) {
     ret = io_ctx.snap_lookup(snapname, &snapid);