diff options
| -rw-r--r-- | sys/dev/softraid.c | 8 | ||||
| -rw-r--r-- | sys/dev/softraid_aoe.c | 17 | ||||
| -rw-r--r-- | sys/dev/softraid_crypto.c | 26 |
3 files changed, 25 insertions, 26 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index 5e23e67ad08..ec377b44388 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.143 2009/06/03 06:30:10 marco Exp $ */ +/* $OpenBSD: softraid.c,v 1.144 2009/06/03 17:39:26 ckuethe Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -207,7 +207,7 @@ sr_meta_attach(struct sr_discipline *sd, int force) if (sd->sd_meta_type != SR_META_F_NATIVE) { /* in memory copy of foreign metadata */ - sd->sd_meta_foreign = malloc(smd[sd->sd_meta_type].smd_size , + sd->sd_meta_foreign = malloc(smd[sd->sd_meta_type].smd_size, M_DEVBUF, M_ZERO); if (!sd->sd_meta_foreign) { /* unwind frees sd_meta */ @@ -224,7 +224,7 @@ sr_meta_attach(struct sr_discipline *sd, int force) } sd->sd_vol.sv_chunks = malloc(sizeof(struct sr_chunk *) * i, M_DEVBUF, M_WAITOK | M_ZERO); - + /* fill out chunk array */ i = 0; SLIST_FOREACH(ch_entry, cl, src_link) @@ -1059,7 +1059,7 @@ sr_meta_native_probe(struct sr_softc *sc, struct sr_chunk *ch_entry) if (label.d_partitions[part].p_fstype != FS_RAID) { DNPRINTF(SR_D_META, "%s: %s partition not of type RAID (%d)\n", DEVNAME(sc) , - devname, + devname, label.d_partitions[part].p_fstype); goto unwind; } diff --git a/sys/dev/softraid_aoe.c b/sys/dev/softraid_aoe.c index df21165120a..a0d03c4668a 100644 --- a/sys/dev/softraid_aoe.c +++ b/sys/dev/softraid_aoe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_aoe.c,v 1.6 2009/06/02 21:23:11 marco Exp $ */ +/* $OpenBSD: softraid_aoe.c,v 1.7 2009/06/03 17:39:26 ckuethe Exp $ */ /* * Copyright (c) 2008 Ted Unangst <tedu@openbsd.org> * Copyright (c) 2008 Marco Peereboom <marco@openbsd.org> @@ -282,7 +282,7 @@ sr_aoe_rw(struct sr_workunit *wu) int fragsize; const int aoe_frags = 2; - + printf("%s: sr_aoe_rw 0x%02x\n", DEVNAME(sd->sd_sc), xs->cmd->opcode); return (1); @@ -366,9 +366,8 @@ ragain: default: goto bad; } - } - + tag = ++sd->mds.mdd_aoe.sra_tag; ah = sd->mds.mdd_aoe.sra_ah; ar = malloc(sizeof(*ar), M_DEVBUF, M_NOWAIT); @@ -382,7 +381,7 @@ ragain: timeout_set(&ar->to, sr_aoe_timeout, ar); TAILQ_INSERT_TAIL(&ah->reqs, ar, next); splx(s); - + ifp = ah->ifp; MGETHDR(m, M_DONTWAIT, MT_HEADER); if (xs->flags & SCSI_DATA_OUT && m) { @@ -399,7 +398,7 @@ ragain: free(ar, M_DEVBUF); return ENOMEM; } - + eh = mtod(m, struct ether_header *); memcpy(eh->ether_dhost, sd->mds.mdd_aoe.sra_eaddr, 6); memcpy(eh->ether_shost, ((struct arpcom *)ifp)->ac_enaddr, 6); @@ -423,7 +422,7 @@ ragain: ap->feature = 0; ap->sectorcnt = fragsize / 512; AOE_BLK2HDR(fragblk, ap); - + m->m_pkthdr.len = m->m_len = AOE_CMDHDRLEN + fragsize; s = splnet(); IFQ_ENQUEUE(&ifp->if_snd, m, NULL, rv); @@ -431,7 +430,7 @@ ragain: (*ifp->if_start)(ifp); timeout_add(&ar->to, hz * 10); splx(s); - + if (rv) { s = splbio(); TAILQ_REMOVE(&ah->reqs, ar, next); @@ -494,7 +493,7 @@ sr_aoe_input(struct aoe_handler *ah, struct mbuf *m) } wu->swu_ios_complete++; - + s = splbio(); if (wu->swu_ios_complete == wu->swu_io_count) { diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c index 1479ded33a3..c5c407c67ff 100644 --- a/sys/dev/softraid_crypto.c +++ b/sys/dev/softraid_crypto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_crypto.c,v 1.35 2009/06/02 21:23:11 marco Exp $ */ +/* $OpenBSD: softraid_crypto.c,v 1.36 2009/06/03 17:39:27 ckuethe Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org> @@ -434,7 +434,7 @@ sr_crypto_alloc_resources(struct sr_discipline *sd) if (sr_ccb_alloc(sd)) return (ENOMEM); if (sr_crypto_decrypt_key(sd)) - return (EPERM); + return (EPERM); bzero(&cri, sizeof(cri)); cri.cri_alg = CRYPTO_AES_XTS; @@ -598,11 +598,11 @@ sr_crypto_rw2(struct sr_workunit *wu, struct cryptop *crp) TAILQ_INSERT_TAIL(&wu->swu_ccb, ccb, ccb_link); - DNPRINTF(SR_D_DIS, "%s: %s: sr_crypto_rw2: b_bcount: %d " - "b_blkno: %x b_flags 0x%0x b_data %p\n", - DEVNAME(sd->sd_sc), sd->sd_meta->ssd_devname, - ccb->ccb_buf.b_bcount, ccb->ccb_buf.b_blkno, - ccb->ccb_buf.b_flags, ccb->ccb_buf.b_data); + DNPRINTF(SR_D_DIS, "%s: %s: sr_crypto_rw2: b_bcount: %d " + "b_blkno: %x b_flags 0x%0x b_data %p\n", + DEVNAME(sd->sd_sc), sd->sd_meta->ssd_devname, + ccb->ccb_buf.b_bcount, ccb->ccb_buf.b_blkno, + ccb->ccb_buf.b_flags, ccb->ccb_buf.b_data); s = splbio(); @@ -632,14 +632,14 @@ sr_crypto_intr(struct buf *bp) struct cryptop *crp; int s, s2, pend; - DNPRINTF(SR_D_INTR, "%s: sr_crypto_intr bp: %x xs: %x\n", - DEVNAME(sc), bp, wu->swu_xs); + DNPRINTF(SR_D_INTR, "%s: sr_crypto_intr bp: %x xs: %x\n", + DEVNAME(sc), bp, wu->swu_xs); - DNPRINTF(SR_D_INTR, "%s: sr_crypto_intr: b_bcount: %d b_resid: %d" - " b_flags: 0x%0x\n", DEVNAME(sc), ccb->ccb_buf.b_bcount, - ccb->ccb_buf.b_resid, ccb->ccb_buf.b_flags); + DNPRINTF(SR_D_INTR, "%s: sr_crypto_intr: b_bcount: %d b_resid: %d" + " b_flags: 0x%0x\n", DEVNAME(sc), ccb->ccb_buf.b_bcount, + ccb->ccb_buf.b_resid, ccb->ccb_buf.b_flags); - s = splbio(); + s = splbio(); if (ccb->ccb_buf.b_flags & B_ERROR) { printf("%s: i/o error on block %lld\n", DEVNAME(sc), |