From 0e707ae40b9a6f022ce84632456507db50b55a92 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 1 Sep 2017 13:39:35 -0400 Subject: [PATCH] osd: drop last head_exists = true calls No more users! Signed-off-by: Sage Weil --- src/osd/PG.cc | 3 --- src/osd/PrimaryLogPG.cc | 5 ----- 2 files changed, 8 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 3a5261e8e583b..621685e5cbde0 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -3849,9 +3849,6 @@ void PG::_scan_snaps(ScrubMap &smap) continue; } head = hoid.get_head(); - // Make sure head_exists is set - if (hoid.is_head()) - snapset.head_exists = true; continue; } if (hoid.snap < CEPH_MAXSNAP) { diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index ae08d738d095b..1c73559dfcec2 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -6854,7 +6854,6 @@ int PrimaryLogPG::_rollback_to(OpContext *ctx, ceph_osd_op& op) t->remove(soid); } t->clone(soid, rollback_to_sobject); - snapset.head_exists = true; t->add_obc(rollback_to); map >::iterator iter = @@ -6895,8 +6894,6 @@ int PrimaryLogPG::_rollback_to(OpContext *ctx, ceph_osd_op& op) dout(10) << __func__ << " clearing omap flag on " << obs.oi.soid << dendl; obs.oi.clear_flag(object_info_t::FLAG_OMAP); } - - snapset.head_exists = true; } } return ret; @@ -8314,7 +8311,6 @@ void PrimaryLogPG::finish_promote(int r, CopyResults *results, results->snapset, get_osdmap()->require_osd_release < CEPH_RELEASE_LUMINOUS); } - tctx->new_snapset.head_exists = true; dout(20) << __func__ << " new_snapset " << tctx->new_snapset << dendl; // take RWWRITE lock for duration of our local write. ignore starvation. @@ -12282,7 +12278,6 @@ void PrimaryLogPG::hit_set_persist() ctx->new_obs = obc->obs; - obc->ssc->snapset.head_exists = true; ctx->new_snapset = obc->ssc->snapset; ctx->delta_stats.num_objects++; -- 2.39.5