From: Trond Myklebust <trond.myklebust@hammerspace.com>
Date: Thu, 13 Jun 2024 05:00:54 +0000 (-0400)
Subject: NFSv4/pNFS: Remove redundant call to unhash the layout
X-Git-Tag: v6.11-rc1~121^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad3c436dace5538c8d4b424958a723bc23b901dc;p=thirdparty%2Fkernel%2Flinux.git

NFSv4/pNFS: Remove redundant call to unhash the layout

The layout will be automatically unhashed on final release of the
reference count.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index c482088cb485c..31df5fae7acb1 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -858,8 +858,6 @@ pnfs_layout_bulk_destroy_byserver_locked(struct nfs_client *clp,
 			break;
 		inode = pnfs_grab_inode_layout_hdr(lo);
 		if (inode != NULL) {
-			if (test_and_clear_bit(NFS_LAYOUT_HASHED, &lo->plh_flags))
-				list_del_rcu(&lo->plh_layouts);
 			if (pnfs_layout_add_bulk_destroy_list(inode,
 						layout_list))
 				continue;