summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-10-01 14:41:15 -0700
committerJ. Bruce Fields <bfields@citi.umich.edu>2007-10-09 18:32:46 -0400
commitdfad9441be82f1eadc3fa3f1bbc93f93d48d1bdf (patch)
tree059c9e1d075de6a800af3c95bbc837a2e0239819 /fs/nfs
parentfc5846e555177c2ae01bcded7fddf60cb10dcfd0 (diff)
downloadlinux-3.10-dfad9441be82f1eadc3fa3f1bbc93f93d48d1bdf.tar.gz
linux-3.10-dfad9441be82f1eadc3fa3f1bbc93f93d48d1bdf.tar.bz2
linux-3.10-dfad9441be82f1eadc3fa3f1bbc93f93d48d1bdf.zip
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>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/file.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 579cf8a7d4a..9c98ccbf9de 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))