From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Wed, 23 Jan 2013 03:08:37 +0000 (+0800)
Subject: mds: fix end check in Server::handle_client_readdir()
X-Git-Tag: v0.57~92^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a972fd4086dea05b2e7943a20bc8c8d58afbf93c;p=ceph.git

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 <zheng.z.yan@intel.com>
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index dc14bbe2b8d7..87813595fd13 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) {