diff options
author | Neil Brown <neilb@suse.de> | 2008-05-27 09:18:32 +1000 |
---|---|---|
committer | Neil Brown <neilb@suse.de> | 2008-05-27 09:18:32 +1000 |
commit | 2318b9f0dc98b03d3e3374e41b2ca6f85b18f922 (patch) | |
tree | 6726127a79b25ae40749067d21cbbde81544d7a7 /Assemble.c | |
parent | 30e1b9a585ea667a3d79edd4e4ca2bf5692c2ab9 (diff) |
Remove 'fd' arg from sysfs_add_disk
It it never used, and removing means there are several 'open's that can
go.
Diffstat (limited to 'Assemble.c')
-rw-r--r-- | Assemble.c | 19 |
1 files changed, 6 insertions, 13 deletions
@@ -913,19 +913,12 @@ int Assemble(struct supertype *st, char *mddev, int mdfd, if (j >= 0 /* && devices[j].uptodate */) { #ifndef MDASSEMBLE if (st->ss->external) { - int fd = dev_open(devices[j].devname, - O_RDONLY); - if (fd < 0) - rv = 1; - else { - devices[j].i.disk.number = - devices[j].i.disk.raid_disk; - st->ss->getinfo_super_n(st, - &devices[j].i); - rv = sysfs_add_disk(sra, fd, - &devices[j].i); - close(fd); - } + devices[j].i.disk.number = + devices[j].i.disk.raid_disk; + st->ss->getinfo_super_n(st, + &devices[j].i); + rv = sysfs_add_disk(sra, + &devices[j].i); } else #endif rv = ioctl(mdfd, ADD_NEW_DISK, |