From mboxrd@z Thu Jan  1 00:00:00 1970
From: rpeterso@sourceware.org <rpeterso@sourceware.org>
Date: 19 Dec 2006 17:53:32 -0000
Subject: [Cluster-devel] cluster/gfs2 man/mkfs.gfs2.8 mkfs/main_mkfs.c
Message-ID: <20061219175332.21601.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: 	RHEL50
Changes by:	rpeterso at sourceware.org	2006-12-19 17:53:29

Modified files:
	gfs2/man       : mkfs.gfs2.8 
	gfs2/mkfs      : main_mkfs.c 

Log message:
	Resolves: bz 219878: gfs2 creation should default to 1 journal
	and lock_nolock

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/man/mkfs.gfs2.8.diff?cvsroot=cluster&only_with_tag=RHEL50&r1=1.1.4.2&r2=1.1.4.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/main_mkfs.c.diff?cvsroot=cluster&only_with_tag=RHEL50&r1=1.8.4.2&r2=1.8.4.3

--- cluster/gfs2/man/mkfs.gfs2.8	2006/11/30 15:31:56	1.1.4.2
+++ cluster/gfs2/man/mkfs.gfs2.8	2006/12/19 17:53:28	1.1.4.3
@@ -1,5 +1,5 @@
 .\"  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-.\"  Copyright (C) 2004 Red Hat, Inc.  All rights reserved.
+.\"  Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
 
 .TH mkfs.gfs2 8
 
@@ -31,7 +31,8 @@
 .TP
 \fB-j\fP \fINumber\fR 
 The number of journals for gfs2_mkfs to create.  You need at least one
-journal per machine that will mount the filesystem.
+journal per machine that will mount the filesystem.  If this option is
+not specified, one journal will be created.
 .TP
 \fB-O\fP
 This option prevents gfs2_mkfs from asking for confirmation before writing
@@ -41,7 +42,8 @@
 LockProtoName is the name of the  locking  protocol to use.  Acceptable
 locking protocols are \fIlock_dlm\fR or if you are using GFS2
 as a local filesystem (\fB1 node only\fP), you can specify the
-\fIlock_nolock\fR protocol.
+\fIlock_nolock\fR protocol.  If this option is not specified,
+\fIlock_nolock\fR protocol will be assumed.
 .TP
 \fB-q\fP
 Be quiet.  Don't print anything.
--- cluster/gfs2/mkfs/main_mkfs.c	2006/11/30 15:31:56	1.8.4.2
+++ cluster/gfs2/mkfs/main_mkfs.c	2006/12/19 17:53:29	1.8.4.3
@@ -87,6 +87,8 @@
 	int optchar;
 
 	sdp->device_name = NULL;
+	sdp->md.journals = 1;
+	strcpy(sdp->lockproto, "lock_nolock");
 
 	while (cont) {
 		optchar = getopt(argc, argv, "-c:DhJ:j:Op:qr:t:u:VX");