---

yaml --- r: 188023 b: refs/heads/master c: f78233d h: refs/heads/master i: 188021: caf7327 188019: dffc7f5 188015: 0381387 v: v3
git-mirror · Mar 13, 2010 · 91115d2 · 91115d2
1 parent 85a0733
commit 91115d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc0f296126433e61600539325975b6c30681c07e
+refs/heads/master: f78233dd44a110c574fe760ad6f9c1e8741a0d00
diff --git a/trunk/fs/9p/vfs_file.c b/trunk/fs/9p/vfs_file.c
@@ -114,7 +114,7 @@ static int v9fs_file_lock(struct file *filp, int cmd, struct file_lock *fl)
 	P9_DPRINTK(P9_DEBUG_VFS, "filp: %p lock: %p\n", filp, fl);
 
 	/* No mandatory locks */
-	if (__mandatory_lock(inode))
+	if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK)
 		return -ENOLCK;
 
 	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type != F_UNLCK) {