GFS2: clean up explicit check for mandatory locks

The __mandatory_lock(inode) function makes the same check, but makes the code
more readable.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 94d76ac..28773ca 100644 (file)
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -535,7 +535,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
 
        if (!(fl->fl_flags & FL_POSIX))
                return -ENOLCK;
-       if ((ip->i_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID)
+       if (__mandatory_lock(&ip->i_inode))
                return -ENOLCK;
 
        if (sdp->sd_args.ar_localflocks) {
@@ -637,7 +637,7 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)
 
        if (!(fl->fl_flags & FL_FLOCK))
                return -ENOLCK;
-       if ((ip->i_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID)
+       if (__mandatory_lock(&ip->i_inode))
                return -ENOLCK;
 
        if (sdp->sd_args.ar_localflocks)