From: Pavel Emelyanov <xemul@openvz.org>
Date: Mon, 1 Oct 2007 21:41:15 +0000 (-0700)
Subject: NFS: clean up explicit check for mandatory locks
X-Git-Tag: firefly_0821_release~25890^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dfad9441be82f1eadc3fa3f1bbc93f93d48d1bdf;p=firefly-linux-kernel-4.4.55.git

NFS: clean up 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 <xemul@openvz.org>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 579cf8a7d4a7..9c98ccbf9de0 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -522,8 +522,7 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl)
 	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))