RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 17:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: clean up variable name

Browse Source 
"p" is for pair; "it" is for iterator.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2019-01-09 14:32:55 -08:00
parent a994b37695
commit 0243fd9cbe
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/client/Client.cc
View File

@ -2180,8 +2180,8 @@ bool Client::_any_stale_sessions() const
{ {
ceph_assert(client_lock.is_locked_by_me()); ceph_assert(client_lock.is_locked_by_me());
for (const auto &it : mds_sessions) { for (const auto &p : mds_sessions) {
if (it.second.state == MetaSession::STATE_STALE) { if (p.second.state == MetaSession::STATE_STALE) {
return true; return true;
} }
} }
@ -3534,9 +3534,9 @@ void Client::check_caps(Inode *in, unsigned flags)
if (!in->cap_snaps.empty()) if (!in->cap_snaps.empty())
flush_snaps(in); flush_snaps(in);
for (auto &it : in->caps) { for (auto &p : in->caps) {
mds_rank_t mds = it.first; mds_rank_t mds = p.first;
Cap &cap = it.second; Cap &cap = p.second;
MetaSession *session = &mds_sessions.at(mds); MetaSession *session = &mds_sessions.at(mds);
@ -4041,10 +4041,10 @@ void Client::add_update_cap(Inode *in, MetaSession *mds_session, uint64_t cap_id
if ((issued & ~old_caps) && in->auth_cap == &cap) { if ((issued & ~old_caps) && in->auth_cap == &cap) {
// non-auth MDS is revoking the newly grant caps ? // non-auth MDS is revoking the newly grant caps ?
for (auto &it : in->caps) { for (auto &p : in->caps) {
if (&it.second == &cap) if (&p.second == &cap)
continue; continue;
if (it.second.implemented & ~it.second.issued & issued) { if (p.second.implemented & ~p.second.issued & issued) {
check_caps(in, CHECK_CAPS_NODELAY); check_caps(in, CHECK_CAPS_NODELAY);
break; break;
} }
@ -5277,10 +5277,10 @@ void Client::handle_cap_grant(MetaSession *session, Inode *in, Cap *cap, MClient
if (cap == in->auth_cap) { if (cap == in->auth_cap) {
// non-auth MDS is revoking the newly grant caps ? // non-auth MDS is revoking the newly grant caps ?
for (const auto &it : in->caps) { for (const auto &p : in->caps) {
if (&it.second == cap) if (&p.second == cap)
continue; continue;
if (it.second.implemented & ~it.second.issued & new_caps) { if (p.second.implemented & ~p.second.issued & new_caps) {
check = true; check = true;
break; break;
} }
@ -5946,8 +5946,8 @@ void Client::flush_mdlog_sync()
{ {
if (mds_requests.empty()) if (mds_requests.empty())
return; return;
for (auto &it : mds_sessions) { for (auto &p : mds_sessions) {
flush_mdlog(&it.second); flush_mdlog(&p.second);
} }
} }
@ -14420,15 +14420,15 @@ void Client::finish_reclaim()
{ {
auto it = metadata.find("reclaiming_uuid"); auto it = metadata.find("reclaiming_uuid");
if (it == metadata.end()) { if (it == metadata.end()) {
for (auto &it : mds_sessions) for (auto &p : mds_sessions)
it.second.reclaim_state = MetaSession::RECLAIM_NULL; p.second.reclaim_state = MetaSession::RECLAIM_NULL;
return; return;
} }
for (auto &it : mds_sessions) { for (auto &p : mds_sessions) {
it.second.reclaim_state = MetaSession::RECLAIM_NULL; p.second.reclaim_state = MetaSession::RECLAIM_NULL;
auto m = MClientReclaim::create("", MClientReclaim::FLAG_FINISH); auto m = MClientReclaim::create("", MClientReclaim::FLAG_FINISH);
it.second.con->send_message2(m); p.second.con->send_message2(m);
} }
metadata["uuid"] = it->second; metadata["uuid"] = it->second;