From c80a1d02a38024ed148a9ae80378ab60cc3ac74d Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 30 Aug 2010 12:51:31 -0700
Subject: [PATCH] mds: fix bad iterator usage in process_reconnected_caps()

We use p->second, so don't increment p++ early in the loop block.
---
 src/mds/MDCache.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 06a6d97d02c9e..7c7d7636d96c5 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -3976,10 +3976,10 @@ void MDCache::process_reconnected_caps()
   map<client_t,MClientSnap*> splits;
 
   // adjust lock states appropriately
-  map<CInode*,map<client_t,inodeno_t> >::iterator p = reconnected_caps.begin();
-  while (p != reconnected_caps.end()) {
+  for (map<CInode*,map<client_t,inodeno_t> >::iterator p = reconnected_caps.begin();
+       p != reconnected_caps.end();
+       p++) {
     CInode *in = p->first;
-    p++;
 
     in->choose_lock_states();
     dout(15) << " chose lock states on " << *in << dendl;
-- 
2.39.5