From: Samuel Just <sjust@redhat.com>
Date: Fri, 10 Dec 2021 21:42:03 +0000 (+0000)
Subject: crimson/os/seastore/transaction_manager: clarify that init lambda only runs on new... 
X-Git-Tag: v17.1.0~256^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c2d2dd7e70c5831437b0ad4656e949e2ad7116d7;p=ceph.git

crimson/os/seastore/transaction_manager: clarify that init lambda only runs on new extents

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/crimson/os/seastore/transaction_manager.cc b/src/crimson/os/seastore/transaction_manager.cc
index 011bd1766490..a04c45ef17b3 100644
--- a/src/crimson/os/seastore/transaction_manager.cc
+++ b/src/crimson/os/seastore/transaction_manager.cc
@@ -444,12 +444,11 @@ TransactionManager::get_extent_if_live_ret TransactionManager::get_extent_if_liv
 	      len,
 	      [this, pin=std::move(pin)](CachedExtent &extent) mutable {
 		auto lref = extent.cast<LogicalCachedExtent>();
-		if (!lref->has_pin()) {
-		  assert(!(pin->has_been_invalidated() ||
-			   lref->has_been_invalidated()));
-		  lref->set_pin(std::move(pin));
-		  lba_manager->add_pin(lref->get_pin());
-		}
+		assert(!lref->has_pin());
+		assert(!lref->has_been_invalidated());
+		assert(!pin->has_been_invalidated());
+		lref->set_pin(std::move(pin));
+		lba_manager->add_pin(lref->get_pin());
 	      });
 	  } else {
 	    return inner_ret(
diff --git a/src/crimson/os/seastore/transaction_manager.h b/src/crimson/os/seastore/transaction_manager.h
index e3f04b3b38d4..5a7226a7c8f8 100644
--- a/src/crimson/os/seastore/transaction_manager.h
+++ b/src/crimson/os/seastore/transaction_manager.h
@@ -156,12 +156,11 @@ public:
       pref.get_paddr(),
       pref.get_length(),
       [this, pin=std::move(pin)](T &extent) mutable {
-	if (!extent.has_pin()) {
-	  assert(!(extent.has_been_invalidated() ||
-		   pin->has_been_invalidated()));
-	  extent.set_pin(std::move(pin));
-	  lba_manager->add_pin(extent.get_pin());
-	}
+	assert(!extent.has_pin());
+	assert(!extent.has_been_invalidated());
+	assert(!pin->has_been_invalidated());
+	extent.set_pin(std::move(pin));
+	lba_manager->add_pin(extent.get_pin());
       }
     ).si_then([FNAME, &t](auto ref) mutable -> ret {
       DEBUGT("got extent {}", t, *ref);