From 9858e01abd57458b04f87fcaeb432ab7edb6ac07 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Mon, 8 Jan 2024 23:53:24 -0500 Subject: [PATCH] mds: make LockType fields const Signed-off-by: Patrick Donnelly --- src/mds/CDentry.cc | 4 ++-- src/mds/CDentry.h | 4 ++-- src/mds/CInode.cc | 21 +++++++++++---------- src/mds/CInode.h | 20 ++++++++++---------- src/mds/LocalLockC.h | 2 +- src/mds/ScatterLock.h | 2 +- src/mds/SimpleLock.h | 4 ++-- 7 files changed, 29 insertions(+), 28 deletions(-) diff --git a/src/mds/CDentry.cc b/src/mds/CDentry.cc index 6722f0f2a3670..8694dfc72a2e6 100644 --- a/src/mds/CDentry.cc +++ b/src/mds/CDentry.cc @@ -38,8 +38,8 @@ ostream& CDentry::print_db_line_prefix(ostream& out) const return out << ceph_clock_now() << " mds." << dir->mdcache->mds->get_nodeid() << ".cache.den(" << dir->ino() << " " << name << ") "; } -LockType CDentry::lock_type(CEPH_LOCK_DN); -LockType CDentry::versionlock_type(CEPH_LOCK_DVERSION); +const LockType CDentry::lock_type(CEPH_LOCK_DN); +const LockType CDentry::versionlock_type(CEPH_LOCK_DVERSION); // CDentry diff --git a/src/mds/CDentry.h b/src/mds/CDentry.h index 1c2b6f892cec5..2566395d18561 100644 --- a/src/mds/CDentry.h +++ b/src/mds/CDentry.h @@ -367,8 +367,8 @@ public: elist::item item_stray; // lock - static LockType lock_type; - static LockType versionlock_type; + static const LockType lock_type; + static const LockType versionlock_type; SimpleLock lock; // FIXME referenced containers not in mempool LocalLockC versionlock; // FIXME referenced containers not in mempool diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc index 6ef7d240a0edc..7e9185ff5cc66 100644 --- a/src/mds/CInode.cc +++ b/src/mds/CInode.cc @@ -91,16 +91,17 @@ public: sr_t* const CInode::projected_inode::UNDEF_SRNODE = (sr_t*)(unsigned long)-1; -LockType CInode::versionlock_type(CEPH_LOCK_IVERSION); -LockType CInode::authlock_type(CEPH_LOCK_IAUTH); -LockType CInode::linklock_type(CEPH_LOCK_ILINK); -LockType CInode::dirfragtreelock_type(CEPH_LOCK_IDFT); -LockType CInode::filelock_type(CEPH_LOCK_IFILE); -LockType CInode::xattrlock_type(CEPH_LOCK_IXATTR); -LockType CInode::snaplock_type(CEPH_LOCK_ISNAP); -LockType CInode::nestlock_type(CEPH_LOCK_INEST); -LockType CInode::flocklock_type(CEPH_LOCK_IFLOCK); -LockType CInode::policylock_type(CEPH_LOCK_IPOLICY); +const LockType CInode::quiescelock_type(CEPH_LOCK_IQUIESCE); +const LockType CInode::versionlock_type(CEPH_LOCK_IVERSION); +const LockType CInode::authlock_type(CEPH_LOCK_IAUTH); +const LockType CInode::linklock_type(CEPH_LOCK_ILINK); +const LockType CInode::dirfragtreelock_type(CEPH_LOCK_IDFT); +const LockType CInode::filelock_type(CEPH_LOCK_IFILE); +const LockType CInode::xattrlock_type(CEPH_LOCK_IXATTR); +const LockType CInode::snaplock_type(CEPH_LOCK_ISNAP); +const LockType CInode::nestlock_type(CEPH_LOCK_INEST); +const LockType CInode::flocklock_type(CEPH_LOCK_IFLOCK); +const LockType CInode::policylock_type(CEPH_LOCK_IPOLICY); std::string_view CInode::pin_name(int p) const { diff --git a/src/mds/CInode.h b/src/mds/CInode.h index 979b451742cbf..242288d5ec330 100644 --- a/src/mds/CInode.h +++ b/src/mds/CInode.h @@ -1089,16 +1089,16 @@ class CInode : public MDSCacheObject, public InodeStoreBase, public Counter::item item_pop_lru; // -- locks -- - static LockType versionlock_type; - static LockType authlock_type; - static LockType linklock_type; - static LockType dirfragtreelock_type; - static LockType filelock_type; - static LockType xattrlock_type; - static LockType snaplock_type; - static LockType nestlock_type; - static LockType flocklock_type; - static LockType policylock_type; + static const LockType versionlock_type; + static const LockType authlock_type; + static const LockType linklock_type; + static const LockType dirfragtreelock_type; + static const LockType filelock_type; + static const LockType xattrlock_type; + static const LockType snaplock_type; + static const LockType nestlock_type; + static const LockType flocklock_type; + static const LockType policylock_type; // FIXME not part of mempool LocalLockC versionlock; diff --git a/src/mds/LocalLockC.h b/src/mds/LocalLockC.h index 96cea93ebd05f..4d26a1c3e1429 100644 --- a/src/mds/LocalLockC.h +++ b/src/mds/LocalLockC.h @@ -20,7 +20,7 @@ class LocalLockC : public SimpleLock { public: - LocalLockC(MDSCacheObject *o, LockType *t) : + LocalLockC(MDSCacheObject *o, const LockType *t) : SimpleLock(o, t) { set_state(LOCK_LOCK); // always. } diff --git a/src/mds/ScatterLock.h b/src/mds/ScatterLock.h index f654fd2ff3197..d82487480ba17 100644 --- a/src/mds/ScatterLock.h +++ b/src/mds/ScatterLock.h @@ -22,7 +22,7 @@ class ScatterLock : public SimpleLock { public: - ScatterLock(MDSCacheObject *o, LockType *lt) : + ScatterLock(MDSCacheObject *o, const LockType *lt) : SimpleLock(o, lt) {} ~ScatterLock() override { ceph_assert(!_more); diff --git a/src/mds/SimpleLock.h b/src/mds/SimpleLock.h index 33c091b6244e3..3ef474c19a4b3 100644 --- a/src/mds/SimpleLock.h +++ b/src/mds/SimpleLock.h @@ -173,7 +173,7 @@ public: } } - SimpleLock(MDSCacheObject *o, LockType *lt) : + SimpleLock(MDSCacheObject *o, const LockType *lt) : type(lt), parent(o) {} @@ -599,7 +599,7 @@ public: out << ")"; } - LockType *type; + const LockType *type; protected: // parent (what i lock) -- 2.39.5