diff --git a/[refs] b/[refs]
index 2b18cebfdf18..7090fbafcd74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e95e3f668c85276ce699993596d3b52b0fcf4c5
+refs/heads/master: 720e7749279bde0d08684b1bb4e7a2eedeec6394
diff --git a/trunk/fs/gfs2/file.c b/trunk/fs/gfs2/file.c
index a6abbae8a278..e6dd2aec6f82 100644
--- a/trunk/fs/gfs2/file.c
+++ b/trunk/fs/gfs2/file.c
@@ -640,7 +640,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
 
 	if (!(fl->fl_flags & FL_POSIX))
 		return -ENOLCK;
-	if (__mandatory_lock(&ip->i_inode))
+	if (__mandatory_lock(&ip->i_inode) && fl->fl_type != F_UNLCK)
 		return -ENOLCK;
 
 	if (cmd == F_CANCELLK) {