From a4a414944e1fe4a025d1c0603c58afa608029f9e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 17 Nov 2014 12:46:51 -0800 Subject: [PATCH] osd/ReplicatedPG: drop unnecessary cache_mode checks This currently enumerates all cache modes except none, and we don't arrive in this function when caching is disabled. And creating a whiteout is not cache_mode dependent. Simplify! Signed-off-by: Sage Weil --- src/osd/ReplicatedPG.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 1c60a059e017f..b67cd7644c3db 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -6456,11 +6456,8 @@ void ReplicatedPG::finish_promote(int r, OpRequestRef op, } bool whiteout = false; - if (r == -ENOENT && - soid.snap == CEPH_NOSNAP && - (pool.info.cache_mode == pg_pool_t::CACHEMODE_WRITEBACK || - pool.info.cache_mode == pg_pool_t::CACHEMODE_READFORWARD || - pool.info.cache_mode == pg_pool_t::CACHEMODE_READONLY)) { + if (r == -ENOENT) { + assert(soid.snap == CEPH_NOSNAP); // snap case is above dout(10) << __func__ << " whiteout " << soid << dendl; whiteout = true; } -- 2.39.5