From: Sage Weil <sage@inktank.com>
Date: Wed, 13 Mar 2013 23:08:42 +0000 (-0700)
Subject: client: fix trim_caps() args
X-Git-Tag: v0.60~81^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e6f04db573507ea3794d8a31c1045b860a64e4ee;p=ceph.git

client: fix trim_caps() args

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 0317781c07cc..eed4809647f3 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -1555,7 +1555,7 @@ void Client::handle_client_session(MClientSession *m)
     break;
 
   case CEPH_SESSION_RECALL_STATE:
-    trim_caps(from, m->get_max_caps());
+    trim_caps(session, m->get_max_caps());
     break;
 
   default:
@@ -2875,10 +2875,10 @@ void Client::remove_session_caps(MetaSession *mds)
   }
 }
 
-void Client::trim_caps(int mds, int max)
+void Client::trim_caps(MetaSession *s, int max)
 {
+  int mds = s->mds_num;
   ldout(cct, 10) << "trim_caps mds." << mds << " max " << max << dendl;
-  MetaSession *s = mds_sessions[mds];
 
   int trimmed = 0;
   xlist<Cap*>::iterator p = s->caps.begin();
diff --git a/src/client/Client.h b/src/client/Client.h
index 33419a266cdd..af03bfb0090f 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -371,7 +371,7 @@ protected:
   // trim cache.
   void trim_cache();
   void trim_dentry(Dentry *dn);
-  void trim_caps(int mds, int max);
+  void trim_caps(MetaSession *s, int max);
   
   void dump_inode(Formatter *f, Inode *in, set<Inode*>& did, bool disconnected);
   void dump_cache(Formatter *f);  // debug