X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=fs%2Flocks.c;h=74b2a1dfe8d87e4b12b014a51cb45bd6284f75a2;hb=04045c479a25b1cf76ee4d4a347d2a32e31cf909;hp=5c42363aa811c13930b1722709560bcb5b68e883;hpb=16bb86b5569cb7489367101f6ed69b25682b47db;p=linux-2.6-microblaze.git

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;