From: Neil Brown <neilb@suse.de>
Date: Mon, 26 May 2008 23:18:40 +0000 (+1000)
Subject: Remove supertype->devfd
X-Git-Tag: devel~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5869a76c90aa0725e665d3c7bd6c7ab021d24fd4;p=thirdparty%2Fmdadm.git

Remove supertype->devfd

It is never used.
---

diff --git a/mdadm.h b/mdadm.h
index 20ed4520..7b11ffb1 100644
--- a/mdadm.h
+++ b/mdadm.h
@@ -452,7 +452,6 @@ struct supertype {
 
 	/* extra stuff used by mdmon */
 	struct active_array *arrays;
-	int devfd;
 	int sock; /* listen to external programs */
 	int mgr_pipe[2]; /* communicate between threads */
 	int mon_pipe[2]; /* communicate between threads */
diff --git a/mdmon.c b/mdmon.c
index 7ba8be04..2919a02f 100644
--- a/mdmon.c
+++ b/mdmon.c
@@ -196,7 +196,6 @@ int main(int argc, char *argv[])
 	/* hopefully it is a container - we'll check later */
 
 	container = malloc(sizeof(*container));
-	container->devfd = mdfd;
 	container->devnum = fd2devnum(mdfd);
 	container->devname = devnum2devname(container->devnum);
 
@@ -269,6 +268,7 @@ int main(int argc, char *argv[])
 		exit(3);
 	}
 
+	close(mdfd);
 
 	mlockall(MCL_FUTURE);