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/scsi/cd.c | |
| 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/scsi/cd.c')
| -rw-r--r-- | sys/scsi/cd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 0325b93c54e..dd8c8cd7717 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.199 2011/05/31 17:35:35 matthew Exp $ */ +/* $OpenBSD: cd.c,v 1.200 2011/06/03 21:14:11 matthew Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -525,8 +525,7 @@ cdstrategy(struct buf *bp) * Do bounds checking, adjust transfer. if error, process. * If end of partition, just return. */ - if (bounds_check_with_label(bp, sc->sc_dk.dk_label, - (sc->sc_flags & (CDF_WLABEL|CDF_LABELLING)) != 0) <= 0) + if (bounds_check_with_label(bp, sc->sc_dk.dk_label) <= 0) goto done; /* Place it in the queue of disk activities for this disk. */ |