Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fc5846e555177c2ae01bcded7fddf60cb10dcfd0
Commit:     fc5846e555177c2ae01bcded7fddf60cb10dcfd0
Parent:     66abe5f257e719547744fdb8691cf5d20603f051
Author:     Pavel Emelyanov <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 1 14:41:14 2007 -0700
Committer:  J. Bruce Fields <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 18:32:46 2007 -0400

    AFS: clean up explicit check for mandatory locks
    
    The __mandatory_lock(inode) macro makes the same check, but makes the code
    more readable.
    
    Signed-off-by: Pavel Emelyanov <[EMAIL PROTECTED]>
    Cc: David Howells <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
 fs/afs/flock.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/fs/afs/flock.c b/fs/afs/flock.c
index af6952e..210acaf 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))
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to