summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMarco Peereboom <marco@cvs.openbsd.org>2005-08-22 20:39:40 +0000
committerMarco Peereboom <marco@cvs.openbsd.org>2005-08-22 20:39:40 +0000
commitce271c4984187d62d4a098b12403bf3e6531784b (patch)
tree5248fa9b786e1514feaca27475986df314f3a633 /sys
parentc766fc8f1f86fe54c00dd7cfcecd9f7c85235376 (diff)
Only let unused disks be marked hot spares. ok deraadt@
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/ami.c31
1 files changed, 30 insertions, 1 deletions
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index 94a2fc0f924..cfade4a973d 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ami.c,v 1.68 2005/08/18 04:49:52 marco Exp $ */
+/* $OpenBSD: ami.c,v 1.69 2005/08/22 20:39:39 marco Exp $ */
/*
* Copyright (c) 2001 Michael Shalayeff
@@ -2514,6 +2514,9 @@ ami_ioctl_setstate(sc, bs)
struct bioc_setstate *bs;
{
int func;
+ struct ami_big_diskarray *p;
+ struct scsi_inquiry_data inqbuf;
+ int off;
switch (bs->bs_status) {
case BIOC_SSONLINE:
@@ -2525,6 +2528,27 @@ ami_ioctl_setstate(sc, bs)
break;
case BIOC_SSHOTSPARE:
+ p = malloc(sizeof *p, M_DEVBUF, M_NOWAIT);
+ if (!p) {
+ printf("%s: no memory for setstate\n",
+ sc->sc_dev.dv_xname);
+ return (ENOMEM);
+ }
+
+ if (ami_mgmt(sc, AMI_FCOP, AMI_FC_RDCONF, 0, 0, sizeof *p, p))
+ goto bail;
+
+ off = bs->bs_channel * AMI_MAX_TARGET + bs->bs_target;
+
+ if (p->apd[off].adp_ostatus != AMI_PD_UNCNF)
+ goto bail;
+
+ if (ami_drv_inq(sc, bs->bs_channel, bs->bs_target, 0,
+ &inqbuf))
+ goto bail;
+
+ free(p, M_DEVBUF);
+
func = AMI_STATE_SPARE;
break;
@@ -2539,6 +2563,11 @@ ami_ioctl_setstate(sc, bs)
return (EINVAL);
return (0);
+
+bail:
+ free(p, M_DEVBUF);
+
+ return (EINVAL);
}
#endif /* NBIO > 0 */