From e6f04db573507ea3794d8a31c1045b860a64e4ee Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 13 Mar 2013 16:08:42 -0700 Subject: [PATCH] client: fix trim_caps() args Signed-off-by: Sage Weil --- src/client/Client.cc | 6 +++--- src/client/Client.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 0317781c07cce..eed4809647f3a 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::iterator p = s->caps.begin(); diff --git a/src/client/Client.h b/src/client/Client.h index 33419a266cddc..af03bfb0090f3 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& did, bool disconnected); void dump_cache(Formatter *f); // debug -- 2.39.5