From: Steven Whitehouse Date: Mon, 18 Oct 2010 15:15:38 +0100 Subject: [Cluster-devel] [PATCH 14/22] GFS2: Fix journal check for spectator mounts In-Reply-To: <1287411346-17855-1-git-send-email-swhiteho@redhat.com> References: <1287411346-17855-1-git-send-email-swhiteho@redhat.com> Message-ID: <1287411346-17855-15-git-send-email-swhiteho@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit When checking journals for spectator mounts, we cannot rely on the journal being locked, whatever its jid might be. This patch ensures that we always get the journal locks when checking journals for a spectator mount. Signed-off-by: Steven Whitehouse diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c index f7f89a9..666548e 100644 --- a/fs/gfs2/recovery.c +++ b/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); -- 1.7.1.1