diff options
author | grog <grog@FreeBSD.org> | 2003-05-08 00:36:20 +0000 |
---|---|---|
committer | grog <grog@FreeBSD.org> | 2003-05-08 00:36:20 +0000 |
commit | 2d5f55a20d28a25fb5707f3162e2a66f2b58e0a2 (patch) | |
tree | 71cb5c9d6f2cf383533f0f1ea2ac0f3e15392254 | |
parent | 3cb479005e3704d4079c7038eeb6ebb60b3b6c7e (diff) | |
download | FreeBSD-src-2d5f55a20d28a25fb5707f3162e2a66f2b58e0a2.zip FreeBSD-src-2d5f55a20d28a25fb5707f3162e2a66f2b58e0a2.tar.gz |
ioctl VINUM_READCONFIG: Don't lock configuration here. vinum_scandisk
needs to do it anyway to handle the startup case. This is
part of a fix for the recently reported hangs.
Approved by: re (scottl)
-rw-r--r-- | sys/dev/vinum/vinumioctl.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c index 58dce71..294ac2c 100644 --- a/sys/dev/vinum/vinumioctl.c +++ b/sys/dev/vinum/vinumioctl.c @@ -41,7 +41,7 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumioctl.c,v 1.21 2003/05/04 05:23:09 grog Exp grog $ + * $Id: vinumioctl.c,v 1.22 2003/05/07 03:31:45 grog Exp grog $ * $FreeBSD$ */ @@ -303,9 +303,6 @@ vinum_super_ioctl(dev_t dev, return error; case VINUM_READCONFIG: - error = lock_config(); /* get the config for us alone */ - if (error) /* can't do it, */ - return error; /* give up */ if (((char *) data)[0] == '\0') ioctl_reply->error = vinum_scandisk(NULL); /* built your own list */ else @@ -317,7 +314,6 @@ vinum_super_ioctl(dev_t dev, strcpy(ioctl_reply->msg, "no drives found"); } else if (ioctl_reply->error) strcpy(ioctl_reply->msg, "can't read configuration information, see log file"); - unlock_config(); return 0; /* must be 0 to return the real error info */ case VINUM_INIT: |