[Cluster-devel] cluster gfs/gfs_mkfs/main.c gfs/gfs_mkfs/mkfs_ ...

[adas at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	adas at sourceware.org	2007-10-17 20:16:35

Modified files:
	gfs/gfs_mkfs   : main.c mkfs_gfs.h 
	gfs2/libgfs2   : libgfs2.h 
	gfs2/mkfs      : main_mkfs.c 

Log message:
	fix bz 311591 - make lock_dlm the default lock protocol in mkfs.gfs and mkfs.gfs2

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/main.c.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/mkfs_gfs.h.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/libgfs2.h.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/main_mkfs.c.diff?cvsroot=cluster&r1=1.17&r2=1.18

--- cluster/gfs/gfs_mkfs/main.c	2007/08/22 08:58:44	1.9
+++ cluster/gfs/gfs_mkfs/main.c	2007/10/17 20:16:35	1.10
@@ -335,6 +335,7 @@
 	comline.jsize = MKFS_DEFAULT_JSIZE;
 	comline.rgsize = MKFS_DEFAULT_RGSIZE;
 	comline.rgsize_specified = FALSE;
+	strcpy(comline.lockproto, MKFS_DEFAULT_LOCKPROTO);
 
 	decode_arguments(argc, argv, &comline);
 
--- cluster/gfs/gfs_mkfs/mkfs_gfs.h	2006/11/29 17:25:44	1.5
+++ cluster/gfs/gfs_mkfs/mkfs_gfs.h	2007/10/17 20:16:35	1.6
@@ -157,6 +157,7 @@
 #define MKFS_DEFAULT_SEG_SIZE       (16)
 #define MKFS_DEFAULT_JSIZE          (128)
 #define MKFS_DEFAULT_RGSIZE         (256)
+#define MKFS_DEFAULT_LOCKPROTO      "lock_dlm"
 #define MKFS_EXCESSIVE_RGS          (10000)
 
 /*  device_geometry.c  */
--- cluster/gfs2/libgfs2/libgfs2.h	2007/09/17 17:08:20	1.19
+++ cluster/gfs2/libgfs2/libgfs2.h	2007/10/17 20:16:35	1.20
@@ -230,6 +230,7 @@
 #define GFS2_DEFAULT_RGSIZE         (256)
 #define GFS2_DEFAULT_UTSIZE         (1)
 #define GFS2_DEFAULT_QCSIZE         (1)
+#define GFS2_DEFAULT_LOCKPROTO      "lock_dlm"
 #define GFS2_MIN_GROW_SIZE          (10)
 #define GFS2_EXCESSIVE_RGS          (10000)
 
--- cluster/gfs2/mkfs/main_mkfs.c	2007/08/22 08:58:46	1.17
+++ cluster/gfs2/mkfs/main_mkfs.c	2007/10/17 20:16:35	1.18
@@ -90,7 +90,6 @@
 
 	memset(sdp->device_name, 0, sizeof(sdp->device_name));
 	sdp->md.journals = 1;
-	strcpy(sdp->lockproto, "lock_nolock");
 
 	while (cont) {
 		optchar = getopt(argc, argv, "-b:c:DhJ:j:Op:qr:t:u:VX");
@@ -374,6 +373,7 @@
 	sdp->rgsize = -1;
 	sdp->utsize = GFS2_DEFAULT_UTSIZE;
 	sdp->qcsize = GFS2_DEFAULT_QCSIZE;
+	strcpy(sdp->lockproto, GFS2_DEFAULT_LOCKPROTO);
 	sdp->time = time(NULL);
 	osi_list_init(&sdp->rglist);
 	osi_list_init(&sdp->buf_list);