[Cluster-devel] cluster/gfs-kernel/src/gfs ops_fstype.c

[teigland@sourceware.org <teigland@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	teigland at sourceware.org	2006-12-19 20:07:26

Modified files:
	gfs-kernel/src/gfs: ops_fstype.c 

Log message:
	When the first mounter is recovering all the journals, it should use
	TRY on the journal locks.  There's one rare case where other mounters
	will exist who hold journal locks that we don't want to block on.  That's
	when the other mounters are readonly, haven't been able to recover the
	fs after a node failure, and the next rw mounter is told to do first
	mounter recovery.  The journals of these readonly nodes can be skipped
	when the pseudo-first mounter is going through all journals.  Changed
	this a long time ago but never checked it in.
	bz 218551

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/ops_fstype.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.28&r2=1.28.2.1

--- cluster/gfs-kernel/src/gfs/ops_fstype.c	2006/10/23 20:15:28	1.28
+++ cluster/gfs-kernel/src/gfs/ops_fstype.c	2006/12/19 20:07:25	1.28.2.1
@@ -436,7 +436,7 @@
 		for (x = 0; x < sdp->sd_journals; x++) {
 			error = gfs_recover_journal(sdp,
 						    x, sdp->sd_jindex + x,
-						    TRUE);
+						    FALSE);
 			if (error) {
 				printk("GFS: fsid=%s: error recovering journal %u: %d\n",
 				       sdp->sd_fsname, x, error);