From mboxrd@z Thu Jan  1 00:00:00 1970
From: adas@sourceware.org <adas@sourceware.org>
Date: 30 Aug 2006 18:32:36 -0000
Subject: [Cluster-devel] cluster/gfs2/mkfs main_jadd.c
Message-ID: <20060830183236.9437.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
Changes by:	adas at sourceware.org	2006-08-30 18:32:36

Modified files:
	gfs2/mkfs      : main_jadd.c 

Log message:
	fix for bz 190204. gfs2_jadd uses the gfs2meta filesystem to add journals to an existing gfs2 fs

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/main_jadd.c.diff?cvsroot=cluster&r1=1.7&r2=1.8

--- cluster/gfs2/mkfs/main_jadd.c	2006/07/20 22:54:25	1.7
+++ cluster/gfs2/mkfs/main_jadd.c	2006/08/30 18:32:36	1.8
@@ -515,7 +515,8 @@
 			   &fspass) != 6)
 			continue;
 		
-		if (strcmp(meta_device, sdp->device_name) != 0)
+		if (strcmp(meta_device, sdp->device_name) != 0
+		    && strcmp(meta_device, sdp->path_name) != 0)
 			continue;
 		
 		metafs_mounted = 1;
@@ -652,11 +653,7 @@
 	check_for_gfs2(sdp);
 
 	gather_info(sdp);
-	/* umount gfs2 to be able to mount gfs2meta */
-	{
-		close(sdp->path_fd);
-		umount(sdp->path_name);
-	}
+
 	if (!find_gfs2_meta(sdp))
 		mount_gfs2_meta(sdp);
 	lock_for_admin(sdp);
@@ -675,7 +672,7 @@
 	}
 
 	close(metafs_fd);
-	//close(sdp->path_fd);
+	close(sdp->path_fd);
 
 	cleanup(sdp);