From: NeilBrown <neilb@suse.de>
Date: Fri, 7 Nov 2008 11:15:14 +0000 (+1100)
Subject: Assemble:  close mdfd before returning from assemble_container_content
X-Git-Tag: mdadm-3.0-devel3~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4408ee768bab1282b23d97c3d3e073292f79e982;p=thirdparty%2Fmdadm.git

Assemble:  close mdfd before returning from assemble_container_content

This makes sure it is consistently closed.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Assemble.c b/Assemble.c
index 29e3ec76..20c4be7a 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -1205,8 +1205,10 @@ int assemble_container_content(struct supertype *st, int mdfd,
 
 	sra = sysfs_read(mdfd, 0, GET_VERSION);
 	if (sra == NULL || strcmp(sra->text_version, content->text_version) != 0)
-		if (sysfs_set_array(content, md_get_version(mdfd)) != 0)
+		if (sysfs_set_array(content, md_get_version(mdfd)) != 0) {
+			close(mdfd);
 			return 1;
+		}
 	if (sra)
 		sysfs_free(sra);
 
@@ -1215,9 +1217,10 @@ int assemble_container_content(struct supertype *st, int mdfd,
 			working++;
 		else if (errno == EEXIST)
 			preexist++;
-	if (working == 0)
+	if (working == 0) {
+		close(mdfd);
 		return 1;/* Nothing new, don't try to start */
-	else if (runstop > 0 ||
+	} else if (runstop > 0 ||
 		 (working + preexist) >= content->array.working_disks) {
 
 		map_update(&map, fd2devnum(mdfd),
@@ -1249,6 +1252,7 @@ int assemble_container_content(struct supertype *st, int mdfd,
 			fprintf(stderr, "\n");
 		}
 		wait_for(chosen_name);
+		close(mdfd);
 		return 0;
 		/* FIXME should have an O_EXCL and wait for read-auto */
 	} else {
@@ -1257,6 +1261,7 @@ int assemble_container_content(struct supertype *st, int mdfd,
 				": %s assembled with %d devices but "
 				"not started\n",
 				chosen_name, working);
+		close(mdfd);
 		return 1;
 	}
 }
diff --git a/Incremental.c b/Incremental.c
index ff8aa9a9..474f78d6 100644
--- a/Incremental.c
+++ b/Incremental.c
@@ -829,7 +829,6 @@ int Incremental_container(struct supertype *st, char *devname, int verbose,
 
 		err = assemble_container_content(st, mdfd, ra, runstop,
 						 chosen_name, verbose);
-		close(mdfd);
 		if (err)
 			return err;
 	}