summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-07-23 15:46:23 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-07-31 14:42:20 -0400
commitad0fcd4eb68059de02e1766948263c71b8a5b1dc (patch)
treedd3f5bfc443ded3fe4cdb7662374e7ba7198ebec /fs
parentb042414feb240df5f5911b9bca39b61e6738e814 (diff)
downloadlinux-3.10-ad0fcd4eb68059de02e1766948263c71b8a5b1dc.tar.gz
linux-3.10-ad0fcd4eb68059de02e1766948263c71b8a5b1dc.tar.bz2
linux-3.10-ad0fcd4eb68059de02e1766948263c71b8a5b1dc.zip
nfs: explicitly reject LOCK_MAND flock() requests
We have no mechanism to emulate LOCK_MAND locks on NFSv4, so explicitly return -EINVAL if someone requests it. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/file.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 1557978ca7b..b039a17ee94 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -834,6 +834,15 @@ int nfs_flock(struct file *filp, int cmd, struct file_lock *fl)
if (!(fl->fl_flags & FL_FLOCK))
return -ENOLCK;
+ /*
+ * The NFSv4 protocol doesn't support LOCK_MAND, which is not part of
+ * any standard. In principle we might be able to support LOCK_MAND
+ * on NFSv2/3 since NLMv3/4 support DOS share modes, but for now the
+ * NFS code is not set up for it.
+ */
+ if (fl->fl_type & LOCK_MAND)
+ return -EINVAL;
+
if (NFS_SERVER(inode)->flags & NFS_MOUNT_LOCAL_FLOCK)
is_local = 1;