Move source tree closer to the 2.6.32.17 mainline
/fs/9p/vfs_file.c
blob:3902bf43a0883bfe4b92d384170362e53c910e0d -> blob:5fb43bd19688a11e5c55a6ca1b00713344a93daa
--- fs/9p/vfs_file.c
+++ fs/9p/vfs_file.c
@@ -114,7 +114,7 @@ static int v9fs_file_lock(struct file *f
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) {