From mboxrd@z Thu Jan  1 00:00:00 1970
From: rpeterso@sourceware.org <rpeterso@sourceware.org>
Date: 20 Sep 2006 16:37:57 -0000
Subject: [Cluster-devel] cluster/gfs/gfs_fsck initialize.c
Message-ID: <20060920163757.27986.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	rpeterso at sourceware.org	2006-09-20 16:37:56

Modified files:
	gfs/gfs_fsck   : initialize.c 

Log message:
	Addendum to bz 200883.  If gfs_fsck can't finish initialization,
	it was exiting but not fixing the lock protocol back for normal use.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/initialize.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.1.2.4.4.2.2.3&r2=1.1.2.4.4.2.2.4

--- cluster/gfs/gfs_fsck/initialize.c	2006/09/20 14:04:04	1.1.2.4.4.2.2.3
+++ cluster/gfs/gfs_fsck/initialize.c	2006/09/20 16:37:56	1.1.2.4.4.2.2.4
@@ -389,13 +389,17 @@
 
 	/* initialize important inodes, fill the rgrp and journal indexes, etc */
 	if(fill_super_block(sbp)) {
-	        stack;
+		if(!sbp->opts->no)
+			block_mounters(sbp, 0);
+		stack;
 		return -1;
 	}
 
 	/* verify various things */
 
 	if(init_journals(sbp)) {
+		if(!sbp->opts->no)
+			block_mounters(sbp, 0);
 		stack;
 		return -1;
 	}