Use macro instead of explicit check for mandatory locks

PATCH In review Pavel Emelyanov 1 participant 1 message Sep 12, 2007 NFS client

lore

Share & tools

lore

Pavel Emelyanov

author

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

PATCH 5/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 Trond Myklebust <[email protected]>

---

 fs/nfs/file.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

fs/nfs/file.c +1 -2

index 73ddd2e..8dc2cde 100644
@@ -605,8 +605,7 @@ static int nfs_lock(struct file *filp, i
 	nfs_inc_stats(inode, NFSIOS_VFSLOCK);
 
 	/* No mandatory locks over NFS */
-	if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID &&
-	    fl->fl_type != F_UNLCK)
+	if (__MANDATORY_LOCK(inode) && fl->fl_type != F_UNLCK)
 		return -ENOLCK;
 
 	if (IS_GETLK(cmd))