crimson/os/seastore/cache: fix formatting in get_extent

In particular, this->invalidate and *ref.get() are superfluous.

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

diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h
index d610e0f52d81fc8cc06012b0d29c24e617771556..f6ed9e19c658b13e5abdb54d66da77636b315715 100644 (file)
--- a/src/crimson/os/seastore/cache.h
+++ b/src/crimson/os/seastore/cache.h
@@ -293,6 +293,7 @@ public:
     paddr_t offset,
     segment_off_t length) {
     CachedExtentRef ret;
+    LOG_PREFIX(Cache::get_extent);
     auto result = t.get_extent(offset, &ret);
     if (result != Transaction::get_extent_ret::ABSENT) {
       assert(result != Transaction::get_extent_ret::RETIRED);
@@ -302,19 +303,18 @@ public:
       auto metric_key = std::make_pair(t.get_src(), T::TYPE);
       return trans_intr::make_interruptible(
        get_extent<T>(offset, length, &metric_key)
-      ).si_then(
-       [&t, this](auto ref) {
-         if (!ref->is_valid()) {
-           LOG_PREFIX(Cache::get_extent);
-           DEBUGT("got invalid extent: {}", t, ref);
-           this->invalidate(t, *ref.get());
-           return get_extent_iertr::make_ready_future<TCachedExtentRef<T>>();
-         } else {
-           t.add_to_read_set(ref);
-           return get_extent_iertr::make_ready_future<TCachedExtentRef<T>>(
-             std::move(ref));
-         }
-       });
+      ).si_then([this, FNAME, &t](auto ref) {
+       (void)this; // silence incorrect clang warning about capture
+       if (!ref->is_valid()) {
+         DEBUGT("got invalid extent: {}", t, ref);
+         invalidate(t, *ref);
+         return get_extent_iertr::make_ready_future<TCachedExtentRef<T>>();
+       } else {
+         t.add_to_read_set(ref);
+         return get_extent_iertr::make_ready_future<TCachedExtentRef<T>>(
+           std::move(ref));
+       }
+      });
     }
   }