]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix bad iterator usage in process_reconnected_caps()
authorSage Weil <sage@newdream.net>
Mon, 30 Aug 2010 19:51:31 +0000 (12:51 -0700)
committerSage Weil <sage@newdream.net>
Mon, 30 Aug 2010 19:51:31 +0000 (12:51 -0700)
We use p->second, so don't increment p++ early in the loop block.

src/mds/MDCache.cc

index 102698e73ee04ffbf1e8a6b25788958aa8fdb16f..96e6f82ce30bf81bd2c77822c07a3b2fc9a0c918 100644 (file)
@@ -4012,10 +4012,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;