mds: no return value for issue_client_lease()

Return value is unused.  Also drop obsolete inode lease method declaration.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 8c7787fd459c93563d109fbc5860d6e2b90bb661..ea26a41f4d9d01f79060205ca31dee7f33bc7200 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -2265,7 +2265,7 @@ int Locker::issue_client_lease(CInode *in, client_t client,
 }
 */
 
-int Locker::issue_client_lease(CDentry *dn, client_t client,
+void Locker::issue_client_lease(CDentry *dn, client_t client,
                               bufferlist &bl, utime_t now, Session *session)
 {
   int pool = 1;   // fixme.. do something smart!
@@ -2283,7 +2283,6 @@ int Locker::issue_client_lease(CDentry *dn, client_t client,
     mask |= 1;  // dentry lease.  always 1.
   
   _issue_client_lease(dn, mask, pool, client, bl, now, session);
-  return mask;
 }
 
 

diff --git a/src/mds/Locker.h b/src/mds/Locker.h
index 3edc537b73877aa35e80283e6784301622acfc23..b117e166e2529960f28f97e1773a1fa3768733e1 100644 (file)
--- a/src/mds/Locker.h
+++ b/src/mds/Locker.h
@@ -242,8 +242,7 @@ public:
   void handle_client_lease(class MClientLease *m);
 
   void _issue_client_lease(CDentry *dn, int mask, int pool, client_t client, bufferlist &bl, utime_t now, Session *session);
-  int issue_client_lease(CInode *in, client_t client, bufferlist &bl, utime_t now, Session *session);
-  int issue_client_lease(CDentry *dn, client_t client, bufferlist &bl, utime_t now, Session *session);
+  void issue_client_lease(CDentry *dn, client_t client, bufferlist &bl, utime_t now, Session *session);
   void revoke_client_leases(SimpleLock *lock);
 };