On Thu, 2022-01-06 at 09:35 +0800, xiubli@xxxxxxxxxx wrote:
> From: Xiubo Li <xiubli@xxxxxxxxxx>
>
> The newcaps has already included the Ls, no need to check it again.
>
> Signed-off-by: Xiubo Li <xiubli@xxxxxxxxxx>
> ---
> fs/ceph/caps.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
> index 1f1a1c6987ce..d68f04ec147d 100644
> --- a/fs/ceph/caps.c
> +++ b/fs/ceph/caps.c
> @@ -3451,8 +3451,7 @@ static void handle_cap_grant(struct inode *inode,
> if ((newcaps & CEPH_CAP_LINK_SHARED) &&
> (extra_info->issued & CEPH_CAP_LINK_EXCL) == 0) {
> set_nlink(inode, le32_to_cpu(grant->nlink));
> - if (inode->i_nlink == 0 &&
> - (newcaps & (CEPH_CAP_LINK_SHARED | CEPH_CAP_LINK_EXCL)))
> + if (inode->i_nlink == 0)
> deleted_inode = true;
> }
>
Good catch. Merged into testing branch. It should make v5.17.
Thanks!
--
Jeff Layton <jlayton@xxxxxxxxxx>
