Merge PR ceph#60996 into main

* refs/pull/60996/head:
	mds/SimpleLock: add is_xlocked_by()
	mds/SimpleLock: add has_xlock_by()

Reviewed-by: Patrick Donnelly <[email protected]>
Reviewed-by: Venky Shankar <[email protected]>

Author: vshankar

src/mds/CDentry.h

@@ -232,7 +232,7 @@ class CDentry : public MDSCacheObject, public LRUObject, public Counter<CDentry>
 
   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();

src/mds/LocalLockC.h

@@ -30,7 +30,7 @@ class LocalLockC : public SimpleLock {
   }
 
   bool can_xlock_local() const {
-    return !is_wrlocked() && (get_xlock_by() == MutationRef());
+    return !is_wrlocked() && !has_xlock_by();
   }
 
   bool can_wrlock() const {

src/mds/MDCache.cc

@@ -8527,7 +8527,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)

src/mds/SimpleLock.h

@@ -420,7 +420,7 @@ class SimpleLock {
 
   // xlock
   void get_xlock(MutationRef who, client_t client) { 
-    ceph_assert(get_xlock_by() == MutationRef());
+    ceph_assert(!has_xlock_by());
     ceph_assert(state == LOCK_XLOCK || is_locallock() ||
 	   state == LOCK_LOCK /* if we are a peer */);
     parent->get(MDSCacheObject::PIN_LOCK);
@@ -465,6 +465,12 @@ class SimpleLock {
   MutationRef get_xlock_by() const {
     return have_more() ? more()->xlock_by : MutationRef();
   }
+  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 {