Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-2

[pandora-kernel.git] / fs / afs / flock.c

diff --git a/fs/afs/flock.c b/fs/afs/flock.c
index af6952e..210acaf 100644 (file)
--- 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))