From: Patrick Donnelly <pdonnell@ibm.com>
Date: Wed, 19 Feb 2025 16:32:06 +0000 (-0500)
Subject: client: remove redundant check
X-Git-Tag: v20.0.0^2~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=41a3f099516ae609a0dbb9c2c020f9523adbc26a;p=ceph.git

client: remove redundant check

This condition:

    (!dn->inode || dn->inode->caps_issued_mask(mask, true))

is already checked in the surrounding `if`.

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index c45e8c1a5082..68bce32682c7 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -7413,9 +7413,9 @@ relookup:
       }
       // dir shared caps?
       if (dir->caps_issued_mask(CEPH_CAP_FILE_SHARED, true)) {
-	if (dn->cap_shared_gen == dir->shared_gen &&
-	    (!dn->inode || dn->inode->caps_issued_mask(mask, true)))
-	      goto hit_dn;
+	if (dn->cap_shared_gen == dir->shared_gen) {
+	  goto hit_dn;
+        }
 	if (!dn->inode && (dir->flags & I_COMPLETE)) {
 	  ldout(cct, 10) << __func__ << " concluded ENOENT locally for "
 			 << *dir << " dn '" << dname << "'" << dendl;