From 91115d255528d1f87cc732603e5abe1fe4d58213 Mon Sep 17 00:00:00 2001
From: Sachin Prabhu <sprabhu@redhat.com>
Date: Sat, 13 Mar 2010 09:03:55 -0600
Subject: [PATCH] --- yaml --- r: 188023 b: refs/heads/master c:
 f78233dd44a110c574fe760ad6f9c1e8741a0d00 h: refs/heads/master i:   188021:
 caf7327d075e9c0f813fa70a8bad596cd4ab276d   188019:
 dffc7f57b1a52ccddb801558e695d54e13e51242   188015:
 03813872651470018852a1508de06a9774e2d8e7 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/9p/vfs_file.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a3d635dfceaf..7b219e5d7f29 100644
--- 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
index 019f1cd8750b..df52d488d2a6 100644
--- 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) {