From 049bc8a498d4ab516c2daded8ac44699aa72c982 Mon Sep 17 00:00:00 2001 From: Zhi Zhang Date: Thu, 14 Jan 2016 11:04:42 +0800 Subject: [PATCH] ceph-fuse: double decreased the count to trim caps Signed-off-by: Zhi Zhang zhangz.david@outlook.com (cherry picked from commit d8a3f6d839649243b12cd6f73e6cb8aec1f955c1) --- src/client/Client.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 78599fd50997..717c4d2b4200 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -3458,11 +3458,13 @@ void Client::_invalidate_kernel_dcache() void Client::trim_caps(MetaSession *s, int max) { mds_rank_t mds = s->mds_num; - ldout(cct, 10) << "trim_caps mds." << mds << " max " << max << dendl; + int caps_size = s->caps.size(); + ldout(cct, 10) << "trim_caps mds." << mds << " max " << max + << " caps " << caps_size << dendl; int trimmed = 0; xlist::iterator p = s->caps.begin(); - while ((s->caps.size() - trimmed) > max && !p.end()) { + while ((caps_size - trimmed) > max && !p.end()) { Cap *cap = *p; s->s_cap_iterator = cap; Inode *in = cap->inode; -- 2.47.3