From 99c53e685be14e3974e1770070b42cd49771ee3c Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Fri, 23 Jun 2017 10:54:11 +0800 Subject: [PATCH] os/bluestore: spaces Signed-off-by: xie xingguo --- src/os/bluestore/BlueStore.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 91ca9c043ec..ae87bab35c9 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -2914,9 +2914,9 @@ bool BlueStore::WriteContext::has_conflict( for (auto w : writes) { if (b == w.b) { auto loffs2 = P2ALIGN(w.logical_offset, min_alloc_size); - auto loffs2_end = ROUND_UP_TO( w.logical_offset + w.length0, min_alloc_size); + auto loffs2_end = P2ROUNDUP(w.logical_offset + w.length0, min_alloc_size); if ((loffs <= loffs2 && loffs_end > loffs2) || - (loffs >= loffs2 && loffs < loffs2_end)) { + (loffs >= loffs2 && loffs < loffs2_end)) { return true; } } -- 2.39.5