From: Sage Weil <sage@redhat.com>
Date: Fri, 12 Feb 2016 20:50:24 +0000 (-0500)
Subject: os/filestore/FileJournal: simplify alignment asserts
X-Git-Tag: v10.1.0~213^2~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=caa73ba33c149a2140f7a348cea3cbc4debb5639;p=ceph.git

os/filestore/FileJournal: simplify alignment asserts

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

diff --git a/src/os/filestore/FileJournal.cc b/src/os/filestore/FileJournal.cc
index b0ae170172ec..ce6cd6223b6b 100644
--- a/src/os/filestore/FileJournal.cc
+++ b/src/os/filestore/FileJournal.cc
@@ -1042,12 +1042,9 @@ void FileJournal::align_bl(off64_t pos, bufferlist& bl)
   // make sure list segments are page aligned
   if (directio && (!bl.is_aligned(block_size) ||
 		   !bl.is_n_align_sized(CEPH_DIRECTIO_ALIGNMENT))) {
-    assert(0 == "bl should be align");
-    if ((bl.length() & (CEPH_DIRECTIO_ALIGNMENT - 1)) != 0 ||
-	(pos & (CEPH_DIRECTIO_ALIGNMENT - 1)) != 0)
-      dout(0) << "rebuild_page_aligned failed, " << bl << dendl;
     assert((bl.length() & (CEPH_DIRECTIO_ALIGNMENT - 1)) == 0);
     assert((pos & (CEPH_DIRECTIO_ALIGNMENT - 1)) == 0);
+    assert(0 == "bl was not aligned");
   }
 }