mds/SimpleLock: add is_xlocked_by()

This eliminates more reference counter manipulations.

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

diff --git a/src/mds/CDentry.h b/src/mds/CDentry.h
index ca36da0354f3847ea8641c00cde69166051bb023..205e85b5d3550a0fc7d054d71fb7375f7a8f2832 100644 (file)
--- a/src/mds/CDentry.h
+++ b/src/mds/CDentry.h
@@ -232,7 +232,7 @@ public:
 
   bool use_projected(client_t client, const MutationRef& mut) const {
     return lock.can_read_projected(client) || 
-      lock.get_xlock_by() == mut;
+      lock.is_xlocked_by(mut);
   }
   linkage_t *get_linkage(client_t client, const MutationRef& mut) {
     return use_projected(client, mut) ? get_projected_linkage() : get_linkage();

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 3af0d8c6b1ec5ff19f5eca2cb6f090c0fe67a6b0..0c8f8c3665d2a99124dd52832f1b4cbb7840b7ab 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -8524,7 +8524,7 @@ int MDCache::path_traverse(const MDRequestRef& mdr, MDSContextFactory& cf,
        }
       } else if (!path_locked &&
                 !dn->lock.can_read(client) &&
-                !(dn->lock.is_xlocked() && dn->lock.get_xlock_by() == mdr)) {
+                !(dn->lock.is_xlocked() && dn->lock.is_xlocked_by(mdr))) {
        dout(10) << "traverse: non-readable dentry at " << *dn << dendl;
        dn->lock.add_waiter(SimpleLock::WAIT_RD, cf.build());
        if (mds->logger)

diff --git a/src/mds/SimpleLock.h b/src/mds/SimpleLock.h
index 8ce8970b560afbea9d97fff85158229512feaff9..0749635287837f26ed0b5fdde78d71f969eae230 100644 (file)
--- a/src/mds/SimpleLock.h
+++ b/src/mds/SimpleLock.h
@@ -468,6 +468,9 @@ public:
   bool has_xlock_by() const noexcept {
     return have_more() && more()->xlock_by;
   }
+  bool is_xlocked_by(const MutationRef &who) const noexcept {
+    return have_more() && more()->xlock_by == who;
+  }
   
   // lease
   bool is_leased() const {