---

yaml --- r: 320547 b: refs/heads/master c: ad0fcd4 h: refs/heads/master i: 320545: 9523cb9 320543: 5668c95 v: v3
git-mirror · Jul 31, 2012 · 4884088 · 4884088
1 parent 9160fa3
commit 4884088
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b042414feb240df5f5911b9bca39b61e6738e814
+refs/heads/master: ad0fcd4eb68059de02e1766948263c71b8a5b1dc
diff --git a/trunk/fs/nfs/file.c b/trunk/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;