From: Xiubo Li <xiubli@redhat.com>
Date: Mon, 8 May 2023 11:34:19 +0000 (+0800)
Subject: client: clean up the queue_cap_snap() code to remove unnecessary check
X-Git-Tag: v19.0.0~861^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cebb5a61c507e05fdd391ee1c569e5a3a0860c2a;p=ceph-ci.git

client: clean up the queue_cap_snap() code to remove unnecessary check

If the 'dirty' is true then 'dirty & CEPH_CAP_ANY_WR' will always be
true.

Fixes: https://tracker.ceph.com/issues/59343
Signed-off-by: Xiubo Li <xiubli@redhat.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index b0400f9d912..6d4d641c212 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -4053,15 +4053,13 @@ void Client::queue_cap_snap(Inode *in, SnapContext& old_snapc)
       in->cap_snaps.rbegin()->second.writing) {
     ldout(cct, 10) << __func__ << " already have pending cap_snap on " << *in << dendl;
     return;
-  } else if (in->caps_dirty() ||
-            (used & CEPH_CAP_FILE_WR) ||
-	     (dirty & CEPH_CAP_ANY_WR)) {
+  } else if (dirty || (used & CEPH_CAP_FILE_WR)) {
     const auto &capsnapem = in->cap_snaps.emplace(std::piecewise_construct, std::make_tuple(old_snapc.seq), std::make_tuple(in));
     ceph_assert(capsnapem.second); /* element inserted */
     CapSnap &capsnap = capsnapem.first->second;
     capsnap.context = old_snapc;
     capsnap.issued = in->caps_issued();
-    capsnap.dirty = in->caps_dirty();
+    capsnap.dirty = dirty;
 
     capsnap.dirty_data = (used & CEPH_CAP_FILE_BUFFER);