diff options
| author | Sage Weil <sage@inktank.com> | 2013-01-28 18:15:35 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-01-28 18:15:35 -0800 |
| commit | 87d85fa2630afdf24139bd574d2c8607a3675170 (patch) | |
| tree | e5db0d43f2573c24b8fe455feb2f4826f4b07012 | |
| parent | e58fe519800877f69628046d83d948d989e6ad5f (diff) | |
| parent | f41010c44b3a4489525d25cd35084a168dc5f537 (diff) | |
| download | ceph-87d85fa2630afdf24139bd574d2c8607a3675170.tar.gz | |
Merge remote-tracking branch 'gh/next'
| -rw-r--r-- | src/mds/Server.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mds/Server.cc b/src/mds/Server.cc index b70445e9a1d..45eed81c6ac 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -2895,11 +2895,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) { |