From 3c1cf727d98e23ba38b2e21999f77de85e383b5b Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Thu, 28 Apr 2016 07:59:59 +0800 Subject: [PATCH] os/filestore/FileJournal: optimize align_bl. Using is_aligned_size_and_memory replace is_aligned && is_n_aligned_size. Signed-off-by: Jianpeng Ma --- src/os/filestore/FileJournal.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/os/filestore/FileJournal.cc b/src/os/filestore/FileJournal.cc index 5a77be0fd1f1..5c2b7fbc1e3b 100644 --- a/src/os/filestore/FileJournal.cc +++ b/src/os/filestore/FileJournal.cc @@ -1058,8 +1058,7 @@ int FileJournal::prepare_single_write(write_item &next_write, bufferlist& bl, of 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))) { + if (directio && !bl.is_aligned_size_and_memory(block_size, CEPH_DIRECTIO_ALIGNMENT)) { assert((bl.length() & (CEPH_DIRECTIO_ALIGNMENT - 1)) == 0); assert((pos & (CEPH_DIRECTIO_ALIGNMENT - 1)) == 0); assert(0 == "bl was not aligned"); -- 2.47.3