]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
client: remove redundant check
authorPatrick Donnelly <pdonnell@ibm.com>
Wed, 19 Feb 2025 16:32:06 +0000 (11:32 -0500)
committerPatrick Donnelly <pdonnell@ibm.com>
Mon, 17 Mar 2025 19:43:19 +0000 (15:43 -0400)
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>
(cherry picked from commit 41a3f099516ae609a0dbb9c2c020f9523adbc26a)

src/client/Client.cc

index 2c4cd72cbe4a34be3d2438a7a5c04aea3881814a..0796aa994cc3335d37b8b9acb30c6236eb302718 100644 (file)
@@ -7395,9 +7395,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;