From: Xiubo Li Date: Wed, 30 Dec 2020 01:14:25 +0000 (+0800) Subject: client: clean up the code X-Git-Tag: v16.2.2~8^2~3^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9ae35161a2232db0ba9dc3424d3a033d167456c3;p=ceph.git client: clean up the code Signed-off-by: Xiubo Li (cherry picked from commit 820d39da39e65e99c1d58d56afc415186c1ae933) --- diff --git a/src/client/Client.cc b/src/client/Client.cc index bcf60c4d28b..c25e24c8b09 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -3837,9 +3837,9 @@ void Client::queue_cap_snap(Inode *in, SnapContext& old_snapc) capsnap.context = old_snapc; capsnap.issued = in->caps_issued(); capsnap.dirty = in->caps_dirty(); - + capsnap.dirty_data = (used & CEPH_CAP_FILE_BUFFER); - + capsnap.uid = in->uid; capsnap.gid = in->gid; capsnap.mode = in->mode; @@ -3848,7 +3848,7 @@ void Client::queue_cap_snap(Inode *in, SnapContext& old_snapc) capsnap.xattr_version = in->xattr_version; capsnap.cap_dirtier_uid = in->cap_dirtier_uid; capsnap.cap_dirtier_gid = in->cap_dirtier_gid; - + if (used & CEPH_CAP_FILE_WR) { ldout(cct, 10) << __func__ << " WR used on " << *in << dendl; capsnap.writing = 1; @@ -4948,7 +4948,7 @@ void Client::update_snap_trace(const bufferlist& bl, SnapRealm **realm_ret, bool ldout(cct, 10) << __func__ << " " << *realm << " seq " << info.seq() << " <= " << realm->seq << " and same parent, SKIPPING" << dendl; } - + if (!first_realm) first_realm = realm; else @@ -4960,7 +4960,7 @@ void Client::update_snap_trace(const bufferlist& bl, SnapRealm **realm_ret, bool ++q) { SnapRealm *realm = q->first; // if there are new snaps ? - if (has_new_snaps(q->second, realm->get_snap_context())) { + if (has_new_snaps(q->second, realm->get_snap_context())) { ldout(cct, 10) << " flushing caps on " << *realm << dendl; xlist::iterator r = realm->inodes_with_caps.begin(); while (!r.end()) {