From: Xiubo Li Date: Fri, 14 Aug 2020 23:51:59 +0000 (+0800) Subject: client: minor cleanup to Client related code X-Git-Tag: v17.1.0~628^2~5 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=04b8721dd4b3f02abcb9fce7fcfbcbefb44fbe85;p=ceph-ci.git client: minor cleanup to Client related code Remove the extra while spaces to clean up the code style. Signed-off-by: Xiubo Li --- diff --git a/src/client/Client.cc b/src/client/Client.cc index ddf42266a5c..dad50d2cb0d 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -3585,7 +3585,7 @@ void Client::send_cap(Inode *in, MetaSession *session, Cap *cap, if (flush) follows = in->snaprealm->get_snap_context().seq; - + auto m = make_message(op, in->ino, 0, @@ -3604,14 +3604,14 @@ void Client::send_cap(Inode *in, MetaSession *session, Cap *cap, m->head.uid = in->uid; m->head.gid = in->gid; m->head.mode = in->mode; - + m->head.nlink = in->nlink; - + if (flush & CEPH_CAP_XATTR_EXCL) { encode(in->xattrs, m->xattrbl); m->head.xattr_version = in->xattr_version; } - + m->size = in->size; m->max_size = in->max_size; m->truncate_seq = in->truncate_seq; @@ -3761,11 +3761,7 @@ void Client::check_caps(Inode *in, unsigned flags) used &= ~(CEPH_CAP_FILE_CACHE | CEPH_CAP_FILE_LAZYIO); } - - for (auto &p : in->caps) { - mds_rank_t mds = p.first; - Cap &cap = p.second; - + for (auto &[mds, cap] : in->caps) { MetaSession *session = &mds_sessions.at(mds); cap_used = used; @@ -3773,7 +3769,7 @@ void Client::check_caps(Inode *in, unsigned flags) cap_used &= ~in->auth_cap->issued; revoking = cap.implemented & ~cap.issued; - + ldout(cct, 10) << " cap mds." << mds << " issued " << ccap_string(cap.issued) << " implemented " << ccap_string(cap.implemented)