Use macro instead of explicit check for mandatory locks

PATCH In review Pavel Emelyanov 1 participant 1 message Sep 12, 2007 GFS2 file system

lore

Share & tools

lore

Pavel Emelyanov

author

2007-09-12 11:23 UTC #0 lore raw

PATCH 2/5 Use macro instead of 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 Steven Whitehouse <[email protected]>

---

 fs/gfs2/ops_file.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

fs/gfs2/ops_file.c +2 -2

index 94d76ac..7e814f4 100644
@@ -535,7 +535,7 @@ static int gfs2_lock(struct file *file, 
 
 	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,
 
 	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)