aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
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 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)
522 nfs_inc_stats(inode, NFSIOS_VFSLOCK); 522 nfs_inc_stats(inode, NFSIOS_VFSLOCK);
523 523
524 /* No mandatory locks over NFS */ 524 /* No mandatory locks over NFS */
525 if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID && 525 if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK)
526 fl->fl_type != F_UNLCK)
527 return -ENOLCK; 526 return -ENOLCK;
528 527
529 if (IS_GETLK(cmd)) 528 if (IS_GETLK(cmd))