* [PATCH 5/5][NFS] Use macro instead of explicit check for mandatory locks
@ 2007-09-12 11:28 Pavel Emelyanov
0 siblings, 0 replies; only message in thread
From: Pavel Emelyanov @ 2007-09-12 11:28 UTC (permalink / raw)
To: Andrew Morton; +Cc: Trond Myklebust, Linux Kernel Mailing List, devel
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))
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2007-09-12 11:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-12 11:28 [PATCH 5/5][NFS] Use macro instead of explicit check for mandatory locks Pavel Emelyanov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox