---

yaml --- r: 211632 b: refs/heads/master c: d0795f9 h: refs/heads/master v: v3
git-mirror · Sep 27, 2010 · aa1b559 · aa1b559
1 parent a01ca05
commit aa1b559
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c80dbb58f9c3f84372e37dfe80b41810052ad62f
+refs/heads/master: d0795f912318f65b800c6b619d749c3bf7c930fb
diff --git a/trunk/fs/gfs2/recovery.c b/trunk/fs/gfs2/recovery.c
@@ -456,7 +456,8 @@ void gfs2_recover_func(struct work_struct *work)
 	unsigned int pass;
 	int error;
 
-	if (jd->jd_jid != sdp->sd_lockstruct.ls_jid) {
+	if (sdp->sd_args.ar_spectator ||
+	    (jd->jd_jid != sdp->sd_lockstruct.ls_jid)) {
 		fs_info(sdp, "jid=%u: Trying to acquire journal lock...\n",
 			jd->jd_jid);