]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: remove double-define on iterator 4024/head
authorJohn Spray <john.spray@redhat.com>
Tue, 17 Mar 2015 08:20:54 +0000 (08:20 +0000)
committerJohn Spray <john.spray@redhat.com>
Tue, 17 Mar 2015 08:20:54 +0000 (08:20 +0000)
Signed-off-by: John Spray <john.spray@redhat.com>
src/mds/MDCache.cc

index 64758f3db530a9122b3c503b99dfacb77958146b..792d8e0415fa07e8e2788dba8147825498627c13 100644 (file)
@@ -3564,7 +3564,6 @@ bool MDCache::expire_recursive(
   // Recurse into any dirfrags beneath this inode
   list<CDir*> ls;
   in->get_dirfrags(ls);
-  list<CDir*>::iterator p = ls.begin();
   for (std::list<CDir*>::iterator p = ls.begin(); p != ls.end(); ++p) {
     CDir *subdir = *p;
 
@@ -6241,7 +6240,6 @@ bool MDCache::trim(int max, int count)
           CInode *subtree_in = subtree->inode;
           list<CDir*> ls;
           subtree->inode->get_dirfrags(ls);
-          list<CDir*>::iterator p = ls.begin();
           for (std::list<CDir*>::iterator p = ls.begin(); p != ls.end(); ++p) {
             CDir *frag = *p;
             trim_dirfrag(frag, subtree, expiremap);