NFS/localio: nfs_close_local_fh() fix check for file closed

Trond Myklebust · Trond Myklebust · commit e144d53cf21f · 2025-08-05T16:45:39.000-07:00
If the struct nfs_file_localio is closed, its list entry will be empty, but the nfs_uuid->files list might still contain other entries. Acked-by: Mike Snitzer <snitzer@kernel.org> Tested-by: Mike Snitzer <snitzer@kernel.org> Reviewed-by: NeilBrown <neil@brown.name> Fixes: 21fb440 ("nfs_localio: protect race between nfs_uuid_put() and nfs_close_local_fh()") Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
diff --git a/fs/nfs_common/nfslocalio.c b/fs/nfs_common/nfslocalio.c
@@ -314,7 +314,7 @@ void nfs_close_local_fh(struct nfs_file_localio *nfl)
 		rcu_read_unlock();
 		return;
 	}
-	if (list_empty(&nfs_uuid->files)) {
+	if (list_empty(&nfl->list)) {
 		/* nfs_uuid_put() has started closing files, wait for it
 		 * to finished
 		 */

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ void nfs_close_local_fh(struct nfs_file_localio *nfl)`
`314`	`314`	`rcu_read_unlock();`
`315`	`315`	`return;`
`316`	`316`	`}`
`317`		`- if (list_empty(&nfs_uuid->files)) {`
	`317`	`+ if (list_empty(&nfl->list)) {`
`318`	`318`	`/* nfs_uuid_put() has started closing files, wait for it`
`319`	`319`	`* to finished`
`320`	`320`	`*/`