diff options
| author | NeilBrown <neilb@suse.de> | 2012-11-01 16:14:01 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2013-02-21 17:05:23 +1100 |
| commit | 4dd2df0966ec2e43ea404df5de7adf9f0e1a8e40 (patch) | |
| tree | eeda21aab0004ea6544cb00e2c36ce29f02943dc /mdadm.c | |
| parent | fdcad551e9a54c4aa8c4b63160b76e2c539a0441 (diff) | |
Discard devnum in favour of devnm
We widely use a "devnum" which is 0 or +ve for md%d devices
and -ve for md_d%d devices.
But I want to be able to use md_%s device names.
So get rid of devnum (a number) and use devnm (a 32char string).
eg.
md0
md_d2
md_home
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'mdadm.c')
| -rw-r--r-- | mdadm.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1457,7 +1457,7 @@ int main(int argc, char *argv[]) rv = 1; break; } - sysfs_init(&sra, mdfd, 0); + sysfs_init(&sra, mdfd, NULL); if (array_size == MAX_SIZE) err = sysfs_set_str(&sra, NULL, "array_size", "default"); else @@ -1658,12 +1658,12 @@ static int misc_scan(char devmode, struct context *c) "external:/", 10) == 0; if (members != member) continue; - me = map_by_devnum(&map, e->devnum); + me = map_by_devnm(&map, e->devnm); if (me && me->path && strcmp(me->path, "/unknown") != 0) name = me->path; else - name = get_md_name(e->devnum); + name = get_md_name(e->devnm); if (!name) { pr_err("cannot find device file for %s\n", @@ -1697,7 +1697,7 @@ static int stop_scan(int verbose) if (!progress) last = 1; progress = 0; err = 0; for (e=ms ; e ; e=e->next) { - char *name = get_md_name(e->devnum); + char *name = get_md_name(e->devnm); int mdfd; if (!name) { |