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/sparc | |
| 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/sparc')
| -rw-r--r-- | sys/arch/sparc/dev/presto.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/xd.c | 5 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/xy.c | 5 |
3 files changed, 6 insertions, 8 deletions
diff --git a/sys/arch/sparc/dev/presto.c b/sys/arch/sparc/dev/presto.c index c9e7e01deb3..f9d05429d4c 100644 --- a/sys/arch/sparc/dev/presto.c +++ b/sys/arch/sparc/dev/presto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: presto.c,v 1.20 2010/09/22 06:40:25 krw Exp $ */ +/* $OpenBSD: presto.c,v 1.21 2011/06/03 21:14:11 matthew Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. * All rights reserved. @@ -287,7 +287,7 @@ prestostrategy(struct buf *bp) } /* Do not write on "no trespassing" areas... */ - if (bounds_check_with_label(bp, sc->sc_dk.dk_label, 1) <= 0) + if (bounds_check_with_label(bp, sc->sc_dk.dk_label) <= 0) goto bad; /* Bound the request size, then move data between buf and nvram */ diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c index c284d4e8390..ad9402c735a 100644 --- a/sys/arch/sparc/dev/xd.c +++ b/sys/arch/sparc/dev/xd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xd.c,v 1.53 2010/11/11 17:46:58 miod Exp $ */ +/* $OpenBSD: xd.c,v 1.54 2011/06/03 21:14:11 matthew Exp $ */ /* $NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $ */ /* @@ -1055,8 +1055,7 @@ xdstrategy(bp) * partition. Adjust transfer if needed, and signal errors or early * completion. */ - if (bounds_check_with_label(bp, xd->sc_dk.dk_label, - (xd->flags & XD_WLABEL) != 0) <= 0) + if (bounds_check_with_label(bp, xd->sc_dk.dk_label) <= 0) goto done; /* diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c index 8857c2e4e84..27192e24f46 100644 --- a/sys/arch/sparc/dev/xy.c +++ b/sys/arch/sparc/dev/xy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xy.c,v 1.50 2010/09/22 06:40:25 krw Exp $ */ +/* $OpenBSD: xy.c,v 1.51 2011/06/03 21:14:11 matthew Exp $ */ /* $NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $ */ /* @@ -1018,8 +1018,7 @@ xystrategy(bp) * partition. Adjust transfer if needed, and signal errors or early * completion. */ - if (bounds_check_with_label(bp, xy->sc_dk.dk_label, - (xy->flags & XY_WLABEL) != 0) <= 0) + if (bounds_check_with_label(bp, xy->sc_dk.dk_label) <= 0) goto done; /* |