diff options
| author |   matthew <matthew@openbsd.org> | 2011-06-03 21:14:11 +0000 |
|---|---|---|
| committer | matthew <matthew@openbsd.org> | 2011-06-03 21:14:11 +0000 |
| commit | 58d155a8bd341acd2e73b81dea97af3abb749a0c (patch) | |
| tree | bb8e802bc72a7bc8af785edf9d9be535536ee1f7 /sys/dev/raidframe/rf_openbsdkintf.c | |
| parent | one midicat server can export multiple midithru ports (diff) | |
| download | wireguard-openbsd-58d155a8bd341acd2e73b81dea97af3abb749a0c.tar.xz wireguard-openbsd-58d155a8bd341acd2e73b81dea97af3abb749a0c.zip | |
Get rid of the wlabel argument to bounds_check_with_label(). It's
never done anything in OpenBSD and just clutters disk drivers with
silly flag handling.
More cleanup to follow.
ok deraadt@, millert@; no objections krw@
Diffstat (limited to 'sys/dev/raidframe/rf_openbsdkintf.c')
| -rw-r--r-- | sys/dev/raidframe/rf_openbsdkintf.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/raidframe/rf_openbsdkintf.c b/sys/dev/raidframe/rf_openbsdkintf.c index 87918b57b2f..6122fed877a 100644 --- a/sys/dev/raidframe/rf_openbsdkintf.c +++ b/sys/dev/raidframe/rf_openbsdkintf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_openbsdkintf.c,v 1.61 2011/04/14 20:59:35 pea Exp $ */ +/* $OpenBSD: rf_openbsdkintf.c,v 1.62 2011/06/03 21:14:11 matthew Exp $ */ /* $NetBSD: rf_netbsdkintf.c,v 1.109 2001/07/27 03:30:07 oster Exp $ */ /*- @@ -724,7 +724,6 @@ raidstrategy(struct buf *bp) RF_Raid_t *raidPtr; struct raid_softc *rs = &raid_softc[raidID]; struct disklabel *lp; - int wlabel; s = splbio(); @@ -761,10 +760,9 @@ raidstrategy(struct buf *bp) * Do bounds checking and adjust transfer. If there's an * error, the bounds check will flag that for us. */ - wlabel = rs->sc_flags & (RAIDF_WLABEL | RAIDF_LABELLING); - if (bounds_check_with_label(bp, lp, wlabel) <= 0) { - db1_printf(("Bounds check failed!!:%d %d\n", - (int)bp->b_blkno, (int)wlabel)); + if (bounds_check_with_label(bp, lp) <= 0) { + db1_printf(("Bounds check failed!!: %d\n", + (int)bp->b_blkno)); biodone(bp); goto raidstrategy_end; } |