---

yaml --- r: 146932 b: refs/heads/master c: a12af1e h: refs/heads/master v: v3
git-mirror · Jun 2, 2009 · e3c9bd2 · e3c9bd2
1 parent a9357d4
commit e3c9bd2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);