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 /monitor.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 'monitor.c')
| -rw-r--r-- | monitor.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -573,9 +573,9 @@ static int wait_and_act(struct supertype *container, int nowait) */ int fd; if (sigterm) - fd = open_dev_excl(container->devnum); + fd = open_dev_excl(container->devnm); else - fd = open_dev_flags(container->devnum, O_RDONLY|O_EXCL); + fd = open_dev_flags(container->devnm, O_RDONLY|O_EXCL); if (fd >= 0 || errno != EBUSY) { /* OK, we are safe to leave */ if (sigterm && !dirty_arrays) @@ -586,7 +586,7 @@ static int wait_and_act(struct supertype *container, int nowait) /* On SIGTERM, someone (the take-over mdmon) will * clean up */ - remove_pidfile(container->devname); + remove_pidfile(container->devnm); exit_now = 1; signal_manager(); close(fd); |