VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2021-05-05 13:44:19 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2021-05-05 13:44:19 -0700 commit: a79cdfba68a13b731004f0aafe1155a83830d472 parent: 7c9e41e0ef7d44a0818a3beec30634f3f588a23d

Commit Summary:

Merge tag 'nfsd-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

Diffstat:

1 file changed, 3 insertions, 0 deletions

diff --git a/fs/locks.c b/fs/locks.c
index 5c42363aa811..74b2a1dfe8d8 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1808,6 +1808,9 @@ check_conflicting_open(struct file *filp, const long arg, int flags)
 
 	if (flags & FL_LAYOUT)
 		return 0;
+	if (flags & FL_DELEG)
+		/* We leave these checks to the caller */
+		return 0;
 
 	if (arg == F_RDLCK)
 		return inode_is_open_for_write(inode) ? -EAGAIN : 0;