]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/filestore/FileJournal: simplify alignment asserts 7628/head
authorSage Weil <sage@redhat.com>
Fri, 12 Feb 2016 20:50:24 +0000 (15:50 -0500)
committerSage Weil <sage@redhat.com>
Fri, 12 Feb 2016 20:50:24 +0000 (15:50 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/os/filestore/FileJournal.cc

index b0ae170172ec1670c737faf5fa1cbcdad6098e73..ce6cd6223b6beb9c04fb48d14fa7efac4544145e 100644 (file)
@@ -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");
   }
 }