X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fafs%2Fflock.c;h=210acafe4a9b5d1ec4e5d919e474497c22073ba2;hb=852e1f2a2627274102a3c2dc70a6547aeab99cb6;hp=af6952e39a186c2fd9bbc05411320eb81415575c;hpb=edd5f25f7475013b44f7942bb3b25022792a9c9d;p=linux-2.6

diff --git a/fs/afs/flock.c b/fs/afs/flock.c
index af6952e39a..210acafe4a 100644
--- a/fs/afs/flock.c
+++ b/fs/afs/flock.c
@@ -524,8 +524,7 @@ int afs_lock(struct file *file, int cmd, struct file_lock *fl)
 	       (long long) fl->fl_start, (long long) fl->fl_end);
 
 	/* AFS doesn't support mandatory locks */
-	if ((vnode->vfs_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID &&
-	    fl->fl_type != F_UNLCK)
+	if (__mandatory_lock(&vnode->vfs_inode) && fl->fl_type != F_UNLCK)
 		return -ENOLCK;
 
 	if (IS_GETLK(cmd))