diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-01 14:41:13 -0700 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-10-09 18:32:46 -0400 |
| commit | 7afaac6202782ec28f2039503bdaef666834d60c (patch) | |
| tree | d848662aa677f5fe47fa7c93c2ac9925b3e888ae | |
| parent | a16877ca9cec211708a161057a7cbfbf2cbc3a53 (diff) | |
| download | kernel_samsung_aries-7afaac6202782ec28f2039503bdaef666834d60c.zip kernel_samsung_aries-7afaac6202782ec28f2039503bdaef666834d60c.tar.gz kernel_samsung_aries-7afaac6202782ec28f2039503bdaef666834d60c.tar.bz2 | |
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>
| -rw-r--r-- | fs/gfs2/ops_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c index 94d76ac..28773ca 100644 --- 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) |