From: Neil Brown <neilb@suse.de>
Date: Mon, 4 Apr 2005 05:16:18 +0000 (+0000)
Subject: Add some missing closes of mdfd
X-Git-Tag: mdadm-1.9.0~8
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=commitdiff_plain;h=43fc16763d8cc94275a79247d11da121de716424

Add some missing closes of mdfd

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
---

diff --git a/ChangeLog b/ChangeLog
index aede7dad..fb391d38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ Changes Prior to 1.9.0 release
     -   Use "major", "minor", "makedev" macros instead of 
 	"MAJOR", "MINOR", "MKDEV" so that large device numbers work
 	on 2.6 (providing you have glibc 2.3.3 or later).
+    -   Add some missing closes of open file descriptors.
 
 Changes Prior to 1.8.0 release
     -   Makefile cleanup from  Luca Berra <bluca@comedia.it>
diff --git a/mdadm.c b/mdadm.c
index a6f116f7..79f28860 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -755,11 +755,13 @@ int main(int argc, char *argv[])
 					}
 					if (ioctl(mdfd, GET_ARRAY_INFO, &array)>=0)
 						/* already assembled, skip */
-						continue;
-					rv |= Assemble(array_list->devname, mdfd,
-						       array_list, configfile,
-						       NULL,
-						       readonly, runstop, NULL, verbose, force);
+						;
+					else
+						rv |= Assemble(array_list->devname, mdfd,
+							       array_list, configfile,
+							       NULL,
+							       readonly, runstop, NULL, verbose, force);
+					close(mdfd);
 				}
 		}
 		break;
@@ -803,8 +805,10 @@ int main(int argc, char *argv[])
 							rv |= Detail(name, !verbose, test);
 						else if (devmode=='S') {
 							mdfd = open_mddev(name, 0);
-							if (mdfd >= 0)
+							if (mdfd >= 0) {
 								rv |= Manage_runstop(name, mdfd, -1);
+								close(mdfd);
+							}
 						}
 						put_md_name(name);
 					}
@@ -823,7 +827,7 @@ int main(int argc, char *argv[])
 					rv |= Query(dv->devname); continue;
 				}
 				mdfd = open_mddev(dv->devname, 0);
-				if (mdfd>=0)
+				if (mdfd>=0) {
 					switch(dv->disposition) {
 					case 'R':
 						rv |= Manage_runstop(dv->devname, mdfd, 1); break;
@@ -834,6 +838,8 @@ int main(int argc, char *argv[])
 					case 'w':
 						rv |= Manage_ro(dv->devname, mdfd, -1); break;
 					}
+					close(mdfd);
+				}
 			}
 		}
 		break;