Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Squash some nits.

Browse Source
This commit is contained in:
ad 2001-02-06 12:53:48 +00:00
parent d606f3d65c
commit 77c450a230
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/dev/ic/mlx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mlx.c,v 1.2 2001/02/05 04:50:27 enami Exp $ */ /* $NetBSD: mlx.c,v 1.3 2001/02/06 12:53:48 ad Exp $ */
/*- /*-
* Copyright (c) 2001 The NetBSD Foundation, Inc. * Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -1163,7 +1163,7 @@ mlx_periodic_enquiry(struct mlx_ccb *mc)
#endif #endif
} }
out: out:
if (mc->mc_mbox[0] == MLX_CMD_ENQSYSDRIVE) if (mc->mc_mbox[0] == MLX_CMD_ENQSYSDRIVE)
mlx->mlx_flags &= ~MLXF_PERIODIC_DRIVE; mlx->mlx_flags &= ~MLXF_PERIODIC_DRIVE;
else else
@ -1207,7 +1207,7 @@ mlx_periodic_eventlog_poll(struct mlx_softc *mlx)
/* Start the command. */ /* Start the command. */
mlx_ccb_enqueue(mlx, mc); mlx_ccb_enqueue(mlx, mc);
out: out:
if (rv != 0) { if (rv != 0) {
if (mc != NULL) if (mc != NULL)
mlx_ccb_free(mlx, mc); mlx_ccb_free(mlx, mc);
@ -1525,7 +1525,7 @@ mlx_enquire(struct mlx_softc *mlx, int command, size_t bufsize,
} }
rv = 0; rv = 0;
out: out:
/* We got a command, but nobody else will free it. */ /* We got a command, but nobody else will free it. */
if (handler == NULL && mc != NULL) { if (handler == NULL && mc != NULL) {
if (mapped) if (mapped)
@ -1578,7 +1578,7 @@ mlx_flush(struct mlx_softc *mlx, int async)
mlx_ccb_diagnose(mc)); mlx_ccb_diagnose(mc));
rv = EIO; rv = EIO;
} }
out: out:
if (mc != NULL) if (mc != NULL)
mlx_ccb_free(mlx, mc); mlx_ccb_free(mlx, mc);
@ -1587,9 +1587,6 @@ out:
/* /*
* Start a background consistency check on (drive). * Start a background consistency check on (drive).
*
* May be called with interrupts enabled or disabled; will return as soon as
* the operation has started or been refused.
*/ */
static int static int
mlx_check(struct mlx_softc *mlx, int drive) mlx_check(struct mlx_softc *mlx, int drive)
@ -1620,7 +1617,7 @@ mlx_check(struct mlx_softc *mlx, int drive)
mlx->mlx_sysdrive[drive].ms_dv->dv_xname); mlx->mlx_sysdrive[drive].ms_dv->dv_xname);
rv = mc->mc_status; rv = mc->mc_status;
out: out:
if (mc != NULL) if (mc != NULL)
mlx_ccb_free(mlx, mc); mlx_ccb_free(mlx, mc);
@ -1660,7 +1657,7 @@ mlx_rebuild(struct mlx_softc *mlx, int channel, int target)
error = mc->mc_status; error = mc->mc_status;
out: out:
if (mc != NULL) if (mc != NULL)
mlx_ccb_free(mlx, mc); mlx_ccb_free(mlx, mc);
@ -1770,7 +1767,7 @@ mlx_user_command(struct mlx_softc *mlx, struct mlx_usercommand *mu)
#endif #endif
} }
out: out:
if (mc != NULL) { if (mc != NULL) {
if (mapped) if (mapped)
mlx_ccb_unmap(mlx, mc); mlx_ccb_unmap(mlx, mc);

4
usr.sbin/mlxctl/extern.h
View File

@ -1,7 +1,7 @@
/* $NetBSD: extern.h,v 1.1 2001/02/04 17:30:37 ad Exp $ */ /* $NetBSD: extern.h,v 1.2 2001/02/06 12:53:49 ad Exp $ */
/*- /*-
* Copyright (c) 2000 The NetBSD Foundation, Inc. * Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
* *
* This code is derived from software contributed to The NetBSD Foundation * This code is derived from software contributed to The NetBSD Foundation

11
usr.sbin/mlxctl/mlxctl.8
View File

@ -1,4 +1,4 @@
.\" $NetBSD: mlxctl.8,v 1.1 2001/02/04 17:30:37 ad Exp $ .\" $NetBSD: mlxctl.8,v 1.2 2001/02/06 12:53:49 ad Exp $
.\" .\"
.\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
.\" All rights reserved. .\" All rights reserved.
@ -125,15 +125,14 @@ This command returns
1 if one or more drives are critical and 1 if one or more drives are critical and
2 if one or more are offline. 2 if one or more are offline.
.It rescan .It rescan
Rescan the controller for new, unattached or changed drives. Re-scan the logical drive table, and attach or detach devices from the system
as necessary.
.It detach .It detach
Detach the specified drives. Drives must be unmounted and unopened for this Detach the specified drives. Drives must be unmounted and unopened for this
command to succeed. command to succeed.
.It check .It check
Initiate a consistency check and repair pass on a redundant drive Initiate a consistency check and repair pass on a drive that provides
(eg. RAID1 or RAID5). redundancy (eg. RAID1 or RAID5). This command returns immediately. The
The controller will scan the drive and repair any inconsistencies. This
command returns immediately. The
.Ar status .Ar status
command can be used to monitor the progress of the check. command can be used to monitor the progress of the check.
.It rebuild .It rebuild