From: Jeff Layton <jlayton@kernel.org>
Date: Mon, 11 Jul 2022 18:30:14 +0000 (-0400)
Subject: lockd: fix nlm_close_files
X-Git-Tag: v6.1-rc5~902^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1197eb5906a5464dbaea24cac296dfc38499cc00;p=platform%2Fkernel%2Flinux-starfive.git

lockd: fix nlm_close_files

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: 7f024fcd5c97 ("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
index b2f2777..e1c4617 100644
--- 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]);
 }
 
 /*