From: NeilBrown <neilb@suse.de>
Date: Tue, 18 Feb 2025 15:39:33 +0000 (-0500)
Subject: nfsd: filecache: use nfsd_file_dispose_list() in nfsd_file_close_inode_sync()
X-Git-Tag: v6.15-rc1~88^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8e6f5cdbc2324dca40aa43242bc7b058fecf1a1;p=thirdparty%2Fkernel%2Flinux.git

nfsd: filecache: use nfsd_file_dispose_list() in nfsd_file_close_inode_sync()

nfsd_file_close_inode_sync() contains an exact copy of
nfsd_file_dispose_list().

This patch removes that copy and calls nfsd_file_dispose_list()
instead.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
index b53fac36bb540..604a2aef5ff70 100644
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -672,17 +672,12 @@ nfsd_file_close_inode(struct inode *inode)
 void
 nfsd_file_close_inode_sync(struct inode *inode)
 {
-	struct nfsd_file *nf;
 	LIST_HEAD(dispose);
 
 	trace_nfsd_file_close(inode);
 
 	nfsd_file_queue_for_close(inode, &dispose);
-	while (!list_empty(&dispose)) {
-		nf = list_first_entry(&dispose, struct nfsd_file, nf_gc);
-		list_del_init(&nf->nf_gc);
-		nfsd_file_free(nf);
-	}
+	nfsd_file_dispose_list(&dispose);
 }
 
 static int