diff --git a/[refs] b/[refs]
index 5836aed79ee9..5250ea2f241a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6eb53498ee8f725832f3a0fffca90566bb118a6
+refs/heads/master: a12af1ebe675e85831fde3c4d0908fc3b0908b7a
diff --git a/trunk/fs/gfs2/file.c b/trunk/fs/gfs2/file.c
index 73b6f552f06d..841ddc979388 100644
--- a/trunk/fs/gfs2/file.c
+++ b/trunk/fs/gfs2/file.c
@@ -698,8 +698,8 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)
 
 	if (!(fl->fl_flags & FL_FLOCK))
 		return -ENOLCK;
-	if (__mandatory_lock(&ip->i_inode))
-		return -ENOLCK;
+	if (fl->fl_type & LOCK_MAND)
+		return -EOPNOTSUPP;
 
 	if (fl->fl_type == F_UNLCK) {
 		do_unflock(file, fl);