summaryrefslogtreecommitdiffstats
path: root/sysfs.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2008-09-18 15:13:32 +1000
committerNeilBrown <neilb@suse.de>2008-09-18 15:13:32 +1000
commit7801ac209240ca5d5159d2ab990dd8d5573e2195 (patch)
tree9eef66102669532a41150d2750c234b6cf658bfe /sysfs.c
parent9b2a22d319a85c1571c776e7059d9ca4bf1a0f0a (diff)
downloadmdadm-7801ac209240ca5d5159d2ab990dd8d5573e2195.tar.gz
mdadm-7801ac209240ca5d5159d2ab990dd8d5573e2195.tar.xz
mdadm-7801ac209240ca5d5159d2ab990dd8d5573e2195.zip
Factor out add-disk code
The variety of approaches to 'add_disk' are factored out into a separate function, and Incremental mode benefits by being closer to supporting the assembly of containers. Also remove the adding-to-array-data-structure out of sysfs_add_disk and into add_disk. And add some tests for --incremental mode to make sure we don't break it. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'sysfs.c')
-rw-r--r--sysfs.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/sysfs.c b/sysfs.c
index 9ef5b39..fdad790 100644
--- a/sysfs.c
+++ b/sysfs.c
@@ -456,7 +456,6 @@ int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd)
{
char dv[100];
char nm[100];
- struct mdinfo *sd2;
char *dname;
int rv;
@@ -482,12 +481,6 @@ int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd)
rv |= sysfs_set_num(sra, sd, "slot", sd->disk.raid_disk);
// rv |= sysfs_set_str(sra, sd, "state", "in_sync");
}
- if (! rv) {
- sd2 = malloc(sizeof(*sd2));
- *sd2 = *sd;
- sd2->next = sra->devs;
- sra->devs = sd2;
- }
return rv;
}