From e800bfa918f9ec7849fc01536d6a753f609114e5 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Mon, 7 Apr 2014 16:05:49 -0700 Subject: [PATCH] Locker: remove Mutation param from xlock_import It's not used. Signed-off-by: Greg Farnum --- src/mds/Locker.cc | 2 +- src/mds/Locker.h | 2 +- src/mds/Server.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 042da7ff7bdbf..21dadbe9ecb61 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -1594,7 +1594,7 @@ void Locker::xlock_export(SimpleLock *lock, Mutation *mut) lock->set_state(LOCK_LOCK); } -void Locker::xlock_import(SimpleLock *lock, Mutation *mut) +void Locker::xlock_import(SimpleLock *lock) { dout(10) << "xlock_import on " << *lock << " " << *lock->get_parent() << dendl; lock->get_parent()->auth_pin(lock); diff --git a/src/mds/Locker.h b/src/mds/Locker.h index 90fbdcb4f74f4..bc3d8233a658b 100644 --- a/src/mds/Locker.h +++ b/src/mds/Locker.h @@ -147,7 +147,7 @@ public: void xlock_finish(SimpleLock *lock, Mutation *mut, bool *pneed_issue); void xlock_export(SimpleLock *lock, Mutation *mut); - void xlock_import(SimpleLock *lock, Mutation *mut); + void xlock_import(SimpleLock *lock); // simple diff --git a/src/mds/Server.cc b/src/mds/Server.cc index a0eda7ac99942..2f45af98e81b3 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -6427,7 +6427,7 @@ void Server::_rename_apply(MDRequestRef& mdr, CDentry *srcdn, CDentry *destdn, C ++i) if ((*i)->get_parent() == destdnl->get_inode() && !(*i)->is_locallock()) - mds->locker->xlock_import(*i, mdr); + mds->locker->xlock_import(*i); // hack: fix auth bit in->state_set(CInode::STATE_AUTH); -- 2.39.5