From a972fd4086dea05b2e7943a20bc8c8d58afbf93c Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Wed, 23 Jan 2013 11:08:37 +0800 Subject: [PATCH] mds: fix end check in Server::handle_client_readdir() commit 1174dd3188 (don't retry readdir request after issuing caps) introduced an bug that wrongly marks 'end' in the the readdir reply. The code that touches existing dentries re-uses an iterator, and the iterator is used for checking if readdir is end. Signed-off-by: Yan, Zheng Signed-off-by: Sage Weil --- src/mds/Server.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index dc14bbe2b8d77..87813595fd135 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -2873,11 +2873,9 @@ void Server::handle_client_readdir(MDRequest *mdr) continue; } else { // touch everything i _do_ have - for (it = dir->begin(); - it != dir->end(); - it++) - if (!it->second->get_linkage()->is_null()) - mdcache->lru.lru_touch(it->second); + for (CDir::map_t::iterator p = dir->begin(); p != dir->end(); p++) + if (!p->second->get_linkage()->is_null()) + mdcache->lru.lru_touch(p->second); // already issued caps and leases, reply immediately. if (dnbl.length() > 0) { -- 2.39.5