From 1bba7fcf548a530b794907389c95869b4a68d8c6 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 19 Feb 2025 11:32:06 -0500 Subject: [PATCH] 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 (cherry picked from commit 41a3f099516ae609a0dbb9c2c020f9523adbc26a) --- src/client/Client.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 2c4cd72cbe4..0796aa994cc 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -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; -- 2.39.5