From: John Spray <john.spray@redhat.com>
Date: Tue, 17 Mar 2015 08:20:54 +0000 (+0000)
Subject: mds: remove double-define on iterator
X-Git-Tag: v9.0.0~162^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4024%2Fhead;p=ceph.git

mds: remove double-define on iterator

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 64758f3db530..792d8e0415fa 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -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);