From: Xiubo Li <xiubli@redhat.com>
Date: Thu, 30 Dec 2021 07:03:35 +0000 (+0800)
Subject: client: remove useless Lx cap check
X-Git-Tag: v17.1.0~68^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=422ac142de8f7a3a7e2a2c44d215bc1d539cdb24;p=ceph.git

client: remove useless Lx cap check

Once here the new_caps must have the 'Ls' caps, the extra check
for 'Lsx' makes no sense.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 1f20eedf60dae..0af249b43e51b 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -5452,8 +5452,7 @@ void Client::handle_cap_grant(MetaSession *session, Inode *in, Cap *cap, const M
   if ((new_caps & CEPH_CAP_LINK_SHARED) &&
       !(issued & CEPH_CAP_LINK_EXCL)) {
     in->nlink = m->head.nlink;
-    if (in->nlink == 0 &&
-	(new_caps & (CEPH_CAP_LINK_SHARED | CEPH_CAP_LINK_EXCL)))
+    if (in->nlink == 0)
       deleted_inode = true;
   }
   if (!(issued & CEPH_CAP_XATTR_EXCL) &&