From: Jiachen Zhang <zhangjiachen.jaycee@bytedance.com>
Date: Thu, 8 Jun 2023 08:46:09 +0000 (+0800)
Subject: fuse: remove an unnecessary if statement
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8a5fb186431326886ccc7b71d40aaf5e53b5d91a;p=linux.git

fuse: remove an unnecessary if statement

FUSE remote locking code paths never add any locking state to
inode->i_flctx, so the locks_remove_posix() function called on
file close will return without calling fuse_setlk().

Therefore, as the if statement to be removed in this commit will
always be false, remove it for clearness.

Signed-off-by: Jiachen Zhang <zhangjiachen.jaycee@bytedance.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 761ae81ef41d5..bd62be510a943 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2678,10 +2678,6 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
 		return -ENOLCK;
 	}
 
-	/* Unlock on close is handled by the flush method */
-	if ((fl->fl_flags & FL_CLOSE_POSIX) == FL_CLOSE_POSIX)
-		return 0;
-
 	fuse_lk_fill(&args, file, fl, opcode, pid_nr, flock, &inarg);
 	err = fuse_simple_request(fm, &args);