---

yaml --- r: 69454 b: refs/heads/master c: dfad944 h: refs/heads/master v: v3
git-mirror · Oct 9, 2007 · 45c645c · 45c645c
1 parent 6d27591
commit 45c645c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc5846e555177c2ae01bcded7fddf60cb10dcfd0
+refs/heads/master: dfad9441be82f1eadc3fa3f1bbc93f93d48d1bdf
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
@@ -522,8 +522,7 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl)
 	nfs_inc_stats(inode, NFSIOS_VFSLOCK);
 
 	/* No mandatory locks over NFS */
-	if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID &&
-	    fl->fl_type != F_UNLCK)
+	if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK)
 		return -ENOLCK;
 
 	if (IS_GETLK(cmd))