OpenVZ Forum


Home » Mailing lists » Devel » [PATCH 5/5][NFS] Use macro instead of explicit check for mandatory locks
[PATCH 5/5][NFS] Use macro instead of explicit check for mandatory locks [message #20120] Wed, 12 September 2007 11:28
Pavel Emelianov is currently offline  Pavel Emelianov
Messages: 1149
Registered: September 2006
Senior Member
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>

---

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

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 73ddd2e..8dc2cde 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -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))
Previous Topic: [PATCH 4/5][AFS] Use macro instead of explicit check for mandatory locks
Next Topic: [-mm PATCH] Memory controller make charging gfp mask aware
Goto Forum:
  


Current Time: Sun Jul 14 02:18:14 GMT 2024

Total time taken to generate the page: 0.02127 seconds