Cleanup explicit check for mandatory locks

PATCH In review Pavel Emelyanov 1 participant 1 message Sep 17, 2007 Afs filesystem

lore

Share & tools

lore

Pavel Emelyanov

author

2007-09-17 07:59 UTC #0 lore raw

PATCH 4/5 Cleanup 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 David Howells <[email protected]>

---

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

fs/afs/flock.c +1 -2

index af6952e..210acaf 100644
@@ -524,8 +524,7 @@ int afs_lock(struct file *file, int cmd,
 	       (long long) fl->fl_start, (long long) fl->fl_end);
 
 	/* AFS doesn't support mandatory locks */
-	if ((vnode->vfs_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID &&
-	    fl->fl_type != F_UNLCK)
+	if (__mandatory_lock(&vnode->vfs_inode) && fl->fl_type != F_UNLCK)
 		return -ENOLCK;
 
 	if (IS_GETLK(cmd))