mds: drop remove_client_lease return value

Unused

diff --git a/src/mds/CDentry.cc b/src/mds/CDentry.cc
index 6c9ed8a1e912136db7b0be7f343f510d2dbd4184..60ba49c30892205aa1191c07642c69cc103710ab 100644 (file)
--- a/src/mds/CDentry.cc
+++ b/src/mds/CDentry.cc
@@ -529,7 +529,7 @@ ClientLease *CDentry::add_client_lease(client_t c, int mask, Session *session)
   return l;
 }
 
-int CDentry::remove_client_lease(ClientLease *l, int mask, Locker *locker) 
+void CDentry::remove_client_lease(ClientLease *l, int mask, Locker *locker) 
 {
   assert(l->parent == this);
 
@@ -546,9 +546,7 @@ int CDentry::remove_client_lease(ClientLease *l, int mask, Locker *locker)
   }
 
   l->mask &= ~mask;
-  int rc = l->mask;
-
-  if (rc == 0) {
+  if (l->mask == 0) {
     dout(20) << "removing lease for client" << l->client << dendl;
     client_lease_map.erase(l->client);
     l->item_lease.remove_myself();
@@ -560,8 +558,6 @@ int CDentry::remove_client_lease(ClientLease *l, int mask, Locker *locker)
 
   if (gather)
     locker->eval_gather(&lock);
-   
-  return rc;
 }
 
 

diff --git a/src/mds/CDentry.h b/src/mds/CDentry.h
index c647ad04d276d3763e6c8b58458fdcf3cec2971f..9cdae84dd4529a1538fc43224e3e811d1b7aeab1 100644 (file)
--- a/src/mds/CDentry.h
+++ b/src/mds/CDentry.h
@@ -383,7 +383,7 @@ public:
   }
 
   ClientLease *add_client_lease(client_t c, int mask, Session *session);
-  int remove_client_lease(ClientLease *r, int mask, class Locker *locker);  // returns remaining mask (if any), and kicks locker eval_gathers
+  void remove_client_lease(ClientLease *r, int mask, class Locker *locker);  // returns remaining mask (if any), and kicks locker eval_gathers
   
 
   

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index ea26a41f4d9d01f79060205ca31dee7f33bc7200..355eae71ab2c50bdb174925e4ff4c47dcd1a8a99 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -2193,8 +2193,7 @@ void Locker::handle_client_lease(MClientLease *m)
     } else {
       dout(7) << "handle_client_lease client" << client
              << " on " << *dn << dendl;
-      int left = dn->remove_client_lease(l, CEPH_LOCK_DN, this);
-      dout(10) << " release remaining mask is " << left << " on " << *dn << dendl;
+      dn->remove_client_lease(l, CEPH_LOCK_DN, this);
     }
     m->put();
     break;