summaryrefslogtreecommitdiffstats
path: root/sbin/vinum
diff options
context:
space:
mode:
authorgrog <grog@FreeBSD.org>2003-05-08 00:33:57 +0000
committergrog <grog@FreeBSD.org>2003-05-08 00:33:57 +0000
commit3cb479005e3704d4079c7038eeb6ebb60b3b6c7e (patch)
treed92bd06892e1bc5fc74327d21efa07e28f9b3333 /sbin/vinum
parent66cc770e2b597815d2150f80917fa91cf85bf34f (diff)
downloadFreeBSD-src-3cb479005e3704d4079c7038eeb6ebb60b3b6c7e.zip
FreeBSD-src-3cb479005e3704d4079c7038eeb6ebb60b3b6c7e.tar.gz
vinum_read: Don't lock configuration from userland. If vinum(8)
crashes, the config remains locked and causes all subsequent start or read attempts to fail. This is part of a fix for the recently reported hangs. Approved by: re (scottl)
Diffstat (limited to 'sbin/vinum')
-rw-r--r--sbin/vinum/commands.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sbin/vinum/commands.c b/sbin/vinum/commands.c
index 1301a3a..d8c9eb2 100644
--- a/sbin/vinum/commands.c
+++ b/sbin/vinum/commands.c
@@ -36,7 +36,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: commands.c,v 1.23 2003/05/04 05:23:59 grog Exp grog $
+ * $Id: commands.c,v 1.24 2003/05/07 03:17:43 grog Exp grog $
* $FreeBSD$
*/
@@ -160,18 +160,12 @@ vinum_read(int argc, char *argv[], char *arg0[])
strcat(buffer, " ");
}
}
- if (ioctl(superdev, VINUM_STARTCONFIG, &force)) { /* can't get config? */
- fprintf(stderr, "Can't configure: %s (%d)\n", strerror(errno), errno);
- return;
- }
ioctl(superdev, VINUM_READCONFIG, &buffer);
if (reply->error != 0) { /* error in config */
fprintf(stdout, "** %s: %s\n", reply->msg, strerror(reply->error));
- error = ioctl(superdev, VINUM_RELEASECONFIG, NULL); /* save the config to disk */
if (error != 0)
perror("Can't save Vinum config");
} else {
- error = ioctl(superdev, VINUM_RELEASECONFIG, NULL); /* save the config to disk */
if (error != 0)
perror("Can't save Vinum config");
if (no_devfs)
OpenPOWER on IntegriCloud