lockd: fix nlm_close_files

jtlayton · chucklever · commit 1197eb5906a5 · 2022-07-11T15:49:56.000-04:00
This loop condition tries a bit too hard to be clever. Just test for the two indices we care about explicitly. Cc: J. Bruce Fields <bfields@fieldses.org> Fixes: 7f024fc ("Keep read and write fds with each nlm_file") Signed-off-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
@@ -283,11 +283,10 @@ nlm_file_inuse(struct nlm_file *file)
 
 static void nlm_close_files(struct nlm_file *file)
 {
-	struct file *f;
-
-	for (f = file->f_file[0]; f <= file->f_file[1]; f++)
-		if (f)
-			nlmsvc_ops->fclose(f);
+	if (file->f_file[O_RDONLY])
+		nlmsvc_ops->fclose(file->f_file[O_RDONLY]);
+	if (file->f_file[O_WRONLY])
+		nlmsvc_ops->fclose(file->f_file[O_WRONLY]);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -283,11 +283,10 @@ nlm_file_inuse(struct nlm_file *file)`
`283`	`283`
`284`	`284`	`static void nlm_close_files(struct nlm_file *file)`
`285`	`285`	`{`
`286`		`- struct file *f;`
`287`		`-`
`288`		`- for (f = file->f_file[0]; f <= file->f_file[1]; f++)`
`289`		`- if (f)`
`290`		`- nlmsvc_ops->fclose(f);`
	`286`	`+ if (file->f_file[O_RDONLY])`
	`287`	`+ nlmsvc_ops->fclose(file->f_file[O_RDONLY]);`
	`288`	`+ if (file->f_file[O_WRONLY])`
	`289`	`+ nlmsvc_ops->fclose(file->f_file[O_WRONLY]);`
`291`	`290`	`}`
`292`	`291`
`293`	`292`	`/*`