---

yaml --- r: 223051 b: refs/heads/master c: 21ac19d h: refs/heads/master i: 223049: cdae237 223047: fd156af v: v3
git-mirror · Dec 8, 2010 · 6002a93 · 6002a93
1 parent a3cf4e2
commit 6002a93
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08a22b392a141c201d7ed4d435de942aa853acd3
+refs/heads/master: 21ac19d484a8ffb66f64487846c8d53afef04d2b
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
@@ -693,13 +693,15 @@ do_getlk(struct file *filp, int cmd, struct file_lock *fl, int is_local)
 {
 	struct inode *inode = filp->f_mapping->host;
 	int status = 0;
+	unsigned int saved_type = fl->fl_type;
 
 	/* Try local locking first */
 	posix_test_lock(filp, fl);
 	if (fl->fl_type != F_UNLCK) {
 		/* found a conflict */
 		goto out;
 	}
+	fl->fl_type = saved_type;
 
 	if (nfs_have_delegation(inode, FMODE_READ))
 		goto out_noconflict;