From: "Yan, Zheng" <[email protected]> For acquiring/cancelling xlock, the lock state transitions for dentry lock and other types of locks are the same. So I think the "type != CEPH_LOCK_DN" check doesn't make sense.
Signed-off-by: Yan, Zheng <[email protected]> --- src/mds/Locker.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 254bbb2..d2d47fb 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -543,13 +543,11 @@ void Locker::cancel_locking(Mutation *mut, set<CInode*> *pneed_issue) dout(10) << "cancel_locking " << *lock << " on " << *mut << dendl; if (lock->get_parent()->is_auth()) { - if (lock->get_type() != CEPH_LOCK_DN) { - bool need_issue = false; - if (lock->get_state() == LOCK_PREXLOCK) - _finish_xlock(lock, -1, &need_issue); - if (need_issue) - pneed_issue->insert(static_cast<CInode *>(lock->get_parent())); - } + bool need_issue = false; + if (lock->get_state() == LOCK_PREXLOCK) + _finish_xlock(lock, -1, &need_issue); + if (need_issue) + pneed_issue->insert(static_cast<CInode *>(lock->get_parent())); } mut->finish_locking(lock); } -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
