---

yaml --- r: 115390 b: refs/heads/master c: f200c11 h: refs/heads/master v: v3
git-mirror · Oct 7, 2008 · 669cf7d · 669cf7d
1 parent c700ec9
commit 669cf7d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44d5759d3fdad660f000ef319f0ec33a6ac6ae28
+refs/heads/master: f200c11c257b8db5c49dfc0b7f84bceae3109779
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
@@ -702,13 +702,6 @@ static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl)
 			filp->f_path.dentry->d_name.name,
 			fl->fl_type, fl->fl_flags);
 
-	/*
-	 * No BSD flocks over NFS allowed.
-	 * Note: we could try to fake a POSIX lock request here by
-	 * using ((u32) filp | 0x80000000) or some such as the pid.
-	 * Not sure whether that would be unique, though, or whether
-	 * that would break in other places.
-	 */
 	if (!(fl->fl_flags & FL_FLOCK))
 		return -ENOLCK;