git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nfsd-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
[sfrench/cifs-2.6.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index 5c42363aa811c13930b1722709560bcb5b68e883..74b2a1dfe8d87e4b12b014a51cb45bd6284f75a2 100644
(file)
--- 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;