Locker: remove Mutation param from xlock_import

It's not used.

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 042da7ff7bdbf72a1169c25cab087708c48688be..21dadbe9ecb6177a92e51d8a50092ee6a009dff5 100644 (file)
--- 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 90fbdcb4f74f499d514b65e46c20770607124267..bc3d8233a658b4b60ef1f31a2347a98f1720aeee 100644 (file)
--- 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 a0eda7ac99942e3b145dedb1e6a5c3e6f4018632..2f45af98e81b3f0d7fd6eac7bec39c95cd34ea1f 100644 (file)
--- 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);