[for-6.16-final PATCH 4/9] Revert "nfs_localio: duplicate nfs_close_local_fh()"

Mike Snitzer
2025-07-14T03:14:07Z

This reverts commit 23adb30505afe36b3e587a9074c3288de3c7e583.

Signed-off-by: Mike Snitzer <snitzer@kernel.org>
---
fs/nfs_common/nfslocalio.c | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/fs/nfs_common/nfslocalio.c b/fs/nfs_common/nfslocalio.c
index 49c59f0c78c6..503f85f64b76 100644
--- a/fs/nfs_common/nfslocalio.c
+++ b/fs/nfs_common/nfslocalio.c
@@ -171,26 +171,7 @@ static bool nfs_uuid_put(nfs_uuid_t *nfs_uuid)

/* Walk list of files and ensure their last references dropped */
list_for_each_entry_safe(nfl, tmp, &local_files, list) {
- struct nfsd_file *ro_nf;
- struct nfsd_file *rw_nf;
-
- ro_nf = unrcu_pointer(xchg(&nfl->ro_file, NULL));
- rw_nf = unrcu_pointer(xchg(&nfl->rw_file, NULL));
-
- spin_lock(&nfs_uuid->lock);
- /* Remove nfl from nfs_uuid->files list */
- list_del_init(&nfl->list);
- spin_unlock(&nfs_uuid->lock);
- /* Now we can allow racing nfs_close_local_fh() to
- * skip the locking.
- */
- RCU_INIT_POINTER(nfl->nfs_uuid, NULL);
-
- if (ro_nf)
- nfs_to_nfsd_file_put_local(ro_nf);
- if (rw_nf)
- nfs_to_nfsd_file_put_local(rw_nf);
-
+ nfs_close_local_fh(nfl);
cond_resched();
}

--
2.44.0