---

yaml --- r: 362253 b: refs/heads/master c: c2952d2 h: refs/heads/master i: 362251: 2002086 v: v3
git-mirror · Apr 4, 2013 · 7d2ee52 · 7d2ee52
1 parent 3dd8e09
commit 7d2ee52
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 441362d06be349430d06e37286adce4b90e6ce96
+refs/heads/master: c2952d202f710d326ac36a8ea6bd216b20615ec8
diff --git a/trunk/fs/gfs2/file.c b/trunk/fs/gfs2/file.c
@@ -923,8 +923,11 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
 		cmd = F_SETLK;
 		fl->fl_type = F_UNLCK;
 	}
-	if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
+	if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) {
+		if (fl->fl_type == F_UNLCK)
+			posix_lock_file_wait(file, fl);
 		return -EIO;
+	}
 	if (IS_GETLK(cmd))
 		return dlm_posix_get(ls->ls_dlm, ip->i_no_addr, file, fl);
 	else if (fl->fl_type == F_UNLCK)