Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add some missing closes of mdfd 

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
This commit is contained in:
Neil Brown 2005-04-04 05:16:18 +00:00
parent 48f7b27ab4
commit 43fc16763d
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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>

20
mdadm.c
View File

@ -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;