diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-06-03 21:14:12 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-06-03 21:14:12 +0000 |
| commit | b49266b0d1eedd55de57e1d4401567959d64668b (patch) | |
| tree | 02b80af63ba95447490b8a98dd6789777c9d630c /sys/arch/vax | |
| parent | d1f6c185b1e681044b7d5340282e8895910755e2 (diff) | |
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/arch/vax')
| -rw-r--r-- | sys/arch/vax/mba/hp.c | 4 | ||||
| -rw-r--r-- | sys/arch/vax/mscp/mscp_disk.c | 5 | ||||
| -rw-r--r-- | sys/arch/vax/vsa/hdc9224.c | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/sys/arch/vax/mba/hp.c b/sys/arch/vax/mba/hp.c index 9320519dd69..aab9ce99558 100644 --- a/sys/arch/vax/mba/hp.c +++ b/sys/arch/vax/mba/hp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hp.c,v 1.24 2011/04/06 18:12:47 miod Exp $ */ +/* $OpenBSD: hp.c,v 1.25 2011/06/03 21:14:11 matthew Exp $ */ /* $NetBSD: hp.c,v 1.22 2000/02/12 16:09:33 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -185,7 +185,7 @@ hpstrategy(bp) sc = hp_cd.cd_devs[unit]; lp = sc->sc_disk.dk_label; - if (bounds_check_with_label(bp, lp, sc->sc_wlabel) <= 0) + if (bounds_check_with_label(bp, lp) <= 0) goto done; bp->b_rawblkno = diff --git a/sys/arch/vax/mscp/mscp_disk.c b/sys/arch/vax/mscp/mscp_disk.c index b1271d0bf3e..07ec65c14bb 100644 --- a/sys/arch/vax/mscp/mscp_disk.c +++ b/sys/arch/vax/mscp/mscp_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mscp_disk.c,v 1.33 2011/04/06 18:12:47 miod Exp $ */ +/* $OpenBSD: mscp_disk.c,v 1.34 2011/06/03 21:14:11 matthew Exp $ */ /* $NetBSD: mscp_disk.c,v 1.30 2001/11/13 07:38:28 lukem Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -318,8 +318,7 @@ rastrategy(bp) * Determine the size of the transfer, and make sure it is * within the boundaries of the partition. */ - if (bounds_check_with_label(bp, ra->ra_disk.dk_label, - ra->ra_wlabel) <= 0) + if (bounds_check_with_label(bp, ra->ra_disk.dk_label) <= 0) goto done; /* Make some statistics... /bqt */ diff --git a/sys/arch/vax/vsa/hdc9224.c b/sys/arch/vax/vsa/hdc9224.c index b39038d61df..c73b2db7cd8 100644 --- a/sys/arch/vax/vsa/hdc9224.c +++ b/sys/arch/vax/vsa/hdc9224.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hdc9224.c,v 1.34 2010/09/28 13:20:50 miod Exp $ */ +/* $OpenBSD: hdc9224.c,v 1.35 2011/06/03 21:14:11 matthew Exp $ */ /* $NetBSD: hdc9224.c,v 1.16 2001/07/26 15:05:09 wiz Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -452,7 +452,7 @@ hdstrategy(struct buf *bp) sc = (void *)hd->sc_dev.dv_parent; lp = hd->sc_disk.dk_label; - if ((bounds_check_with_label(bp, hd->sc_disk.dk_label, 1)) <= 0) + if ((bounds_check_with_label(bp, hd->sc_disk.dk_label)) <= 0) goto done; if (bp->b_bcount == 0) |