From aa1b5599fd8d6e488843f2a7e6c7571e52cdbc9d Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 27 Sep 2010 15:58:11 +0100
Subject: [PATCH] --- yaml --- r: 211632 b: refs/heads/master c:
 d0795f912318f65b800c6b619d749c3bf7c930fb h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/gfs2/recovery.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 818f8af683e7..daadaf880372 100644
--- 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
index f7f89a94a5a4..666548e14596 100644
--- 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);