From mboxrd@z Thu Jan  1 00:00:00 1970
From: rohara@sourceware.org <rohara@sourceware.org>
Date: 12 Jul 2007 15:45:44 -0000
Subject: [Cluster-devel] cluster gfs/gfs_mkfs/main.c gfs2/mkfs/main_mkfs.c
Message-ID: <20070712154544.5953.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:	rohara at sourceware.org	2007-07-12 15:45:44

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

Log message:
	Fix bug where mkfs always exits with EXIT_FAILURE.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/main.c.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/main_mkfs.c.diff?cvsroot=cluster&r1=1.15&r2=1.16

--- cluster/gfs/gfs_mkfs/main.c	2007/07/10 18:01:01	1.7
+++ cluster/gfs/gfs_mkfs/main.c	2007/07/12 15:45:43	1.8
@@ -262,16 +262,13 @@
 		if (strcmp(device, mnt->mnt_fsname) == 0) {
 			printf("cannot create filesystem: ");
 			printf("%s appears to be mounted\n", device);
-			break;
+			endmntent(fp);
+			exit(EXIT_FAILURE);
 		}
 	}
 
 	endmntent(fp);
 
-	if (fp != NULL) {
-		exit(EXIT_FAILURE);
-	}
-
 	return;
 }
 
--- cluster/gfs2/mkfs/main_mkfs.c	2007/07/10 18:21:28	1.15
+++ cluster/gfs2/mkfs/main_mkfs.c	2007/07/12 15:45:44	1.16
@@ -302,16 +302,14 @@
 		if (strcmp(device, mnt->mnt_fsname) == 0) {
 			printf("cannot create filesystem: ");
 			printf("%s appears to be mounted\n", device);
+			endmntent(fp);
+			exit(EXIT_FAILURE);
 			break;
 		}
 	}
 
 	endmntent(fp);
 
-	if (fp != NULL) {
-		exit(EXIT_FAILURE);
-	}
-
 	return;
 }