summaryrefslogtreecommitdiffstats
path: root/Manage.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2009-10-22 11:13:13 +1100
committerNeilBrown <neilb@suse.de>2009-10-22 11:13:13 +1100
commit4a997737a14f580e3addfa1db6be005c37e7c0f4 (patch)
tree2bb5c80319e81728d54822d5b930098746c07057 /Manage.c
parent9739642288555dae607ee4aa0eec0e9245cecf74 (diff)
parent0eb26465c0a14d707ca00f4f7bcdb67bde36f706 (diff)
downloadmdadm-4a997737a14f580e3addfa1db6be005c37e7c0f4.tar.gz
mdadm-4a997737a14f580e3addfa1db6be005c37e7c0f4.tar.xz
mdadm-4a997737a14f580e3addfa1db6be005c37e7c0f4.zip
Merge branch 'master' into devel-3.1
Diffstat (limited to 'Manage.c')
-rw-r--r--Manage.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Manage.c b/Manage.c
index 9217139..6b8cff4 100644
--- a/Manage.c
+++ b/Manage.c
@@ -140,7 +140,7 @@ static void remove_devices(int devnum, char *path)
strcpy(path2, path);
pe = path2 + strlen(path2);
} else
- path = NULL;
+ path2 = path = NULL;
for (part = 0; part < 16; part++) {
if (part) {
@@ -161,6 +161,7 @@ static void remove_devices(int devnum, char *path)
unlink(path2);
}
}
+ free(path2);
}
@@ -649,6 +650,7 @@ int Manage_subdevs(char *devname, int fd,
disc.state |= (1<<MD_DISK_SYNC);
break;
}
+ free(used);
}
if (dv->writemostly == 1)
disc.state |= (1 << MD_DISK_WRITEMOSTLY);