From 4dd2df0966ec2e43ea404df5de7adf9f0e1a8e40 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 1 Nov 2012 16:14:01 +1100 Subject: 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 --- monitor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'monitor.c') diff --git a/monitor.c b/monitor.c index c987d107..e034a6a0 100644 --- a/monitor.c +++ b/monitor.c @@ -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); -- cgit v1.2.3