From: Neil Brown <neilb@suse.de>
Date: Mon, 17 Apr 2006 11:59:45 +0000 (+0000)
Subject: Only in mdadm-inter/: ANNOUNCE-2.0-devel-1
X-Git-Tag: mdadm-1.11.1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=024ce7fe2b6d06dc669d0b675a49c02910853a44;p=thirdparty%2Fmdadm.git

Only in mdadm-inter/: ANNOUNCE-2.0-devel-1
Only in mdadm-inter/: ANNOUNCE-2.0-devel-2
Only in mdadm-inter/: Create.c.orig
Only in mdadm-inter/: bitmap.c
Only in mdadm-inter/: bitmap.h
Only in mdadm-inter/: mdassemble.8
Only in mdadm-inter/: mkd1
diff -ru mdadm-pre/mdadm-1.11.0/super1.c mdadm-inter/super1.c
Signed-off-by: Neil Brown <neilb@suse.de>
---

diff --git a/super1.c b/super1.c
index 86787653..736ed7dd 100644
--- a/super1.c
+++ b/super1.c
@@ -478,11 +478,15 @@ static int write_init_super1(struct supertype *st, void *sbv, mdu_disk_info_t *d
 	*(__u32*)(sb->device_uuid+12) = random();
 
     
-	if (ioctl(fd, BLKGETSIZE, &size))
+	if (ioctl(fd, BLKGETSIZE, &size)) {
+		close(fd);
 		return 1;
+	}
 
-	if (size < 24)
+	if (size < 24) {
+		close(fd);
 		return 2;
+	}
 
 
 	/*
@@ -522,6 +526,7 @@ static int write_init_super1(struct supertype *st, void *sbv, mdu_disk_info_t *d
 	rv = store_super1(fd, sb);
 	if (rv)
 		fprintf(stderr, Name ": failed to write superblock to %s\n", devname);
+	close(fd);
 	return rv;
 }