cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: rohara@sourceware.org <rohara@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster gfs/gfs_mkfs/main.c gfs2/mkfs/main_mkfs.c
Date: 12 Jul 2007 15:49:28 -0000	[thread overview]
Message-ID: <20070712154928.10866.qmail@sourceware.org> (raw)

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	rohara at sourceware.org	2007-07-12 15:49:27

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&only_with_tag=RHEL5&r1=1.5.2.2&r2=1.5.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/main_mkfs.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.8.2.7&r2=1.8.2.8

--- cluster/gfs/gfs_mkfs/main.c	2007/07/10 19:18:19	1.5.2.2
+++ cluster/gfs/gfs_mkfs/main.c	2007/07/12 15:49:27	1.5.2.3
@@ -262,16 +262,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;
 }
 
--- cluster/gfs2/mkfs/main_mkfs.c	2007/07/10 19:18:44	1.8.2.7
+++ cluster/gfs2/mkfs/main_mkfs.c	2007/07/12 15:49:27	1.8.2.8
@@ -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;
 }
 



             reply	other threads:[~2007-07-12 15:49 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-12 15:49 rohara [this message]
  -- strict thread matches above, loose matches on Subject: below --
2007-07-12 15:45 [Cluster-devel] cluster gfs/gfs_mkfs/main.c gfs2/mkfs/main_mkfs.c rohara

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070712154928.10866.qmail@sourceware.org \
    --to=rohara@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).