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

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 011bd1766490ba7b4cee9a3d482cdbc219fd2dcd..a04c45ef17b32a50300d95948f59437246563da5 100644 (file)
--- 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 e3f04b3b38d433761ec7f8da3cea54ea9aa00c50..5a7226a7c8f85017d044a3b85831d3b8e5205e4d 100644 (file)
--- 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);