Skip to content

Commit 6eb1276

Browse files
committed
Merge PR ceph#52523 into main
* refs/pull/52523/head: mds: remove dead method Reviewed-by: Venky Shankar <[email protected]>
2 parents 8392e7d + 23e8ddb commit 6eb1276

File tree

2 files changed

+0
-19
lines changed

2 files changed

+0
-19
lines changed

src/mds/Locker.cc

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2090,24 +2090,6 @@ void Locker::xlock_import(SimpleLock *lock)
20902090
lock->get_parent()->auth_pin(lock);
20912091
}
20922092

2093-
void Locker::xlock_downgrade(SimpleLock *lock, MutationImpl *mut)
2094-
{
2095-
dout(10) << "xlock_downgrade on " << *lock << " " << *lock->get_parent() << dendl;
2096-
auto it = mut->locks.find(lock);
2097-
if (it->is_rdlock())
2098-
return; // already downgraded
2099-
2100-
ceph_assert(lock->get_parent()->is_auth());
2101-
ceph_assert(it != mut->locks.end());
2102-
ceph_assert(it->is_xlock());
2103-
2104-
lock->set_xlock_done();
2105-
lock->get_rdlock();
2106-
xlock_finish(it, mut, nullptr);
2107-
mut->emplace_lock(lock, MutationImpl::LockOp::RDLOCK);
2108-
}
2109-
2110-
21112093
// file i/o -----------------------------------------
21122094

21132095
version_t Locker::issue_file_data_version(CInode *in)

src/mds/Locker.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ class Locker {
114114

115115
void xlock_export(const MutationImpl::lock_iterator& it, MutationImpl *mut);
116116
void xlock_import(SimpleLock *lock);
117-
void xlock_downgrade(SimpleLock *lock, MutationImpl *mut);
118117

119118
void try_simple_eval(SimpleLock *lock);
120119
bool simple_rdlock_try(SimpleLock *lock, MDSContext *con);

0 commit comments

Comments
 (0)