mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 07:38:10 +00:00
Code Issues Releases Wiki Activity

GFS2: clean up explicit check for mandatory locks

Browse source 
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>
This commit is contained in:
Pavel Emelyanov 2007-10-01 14:41:13 -07:00 committed by J. Bruce Fields
parent a16877ca9c
commit 7afaac6202
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/gfs2/ops_file.c
View file

@ -535,7 +535,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
if (!(fl->fl_flags & FL_POSIX)) if (!(fl->fl_flags & FL_POSIX))
return -ENOLCK; return -ENOLCK;
if ((ip->i_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) if (__mandatory_lock(&ip->i_inode))
return -ENOLCK; return -ENOLCK;
if (sdp->sd_args.ar_localflocks) { 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)) if (!(fl->fl_flags & FL_FLOCK))
return -ENOLCK; return -ENOLCK;
if ((ip->i_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) if (__mandatory_lock(&ip->i_inode))
return -ENOLCK; return -ENOLCK;
if (sdp->sd_args.ar_localflocks) if (sdp->sd_args.ar_localflocks)