diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-05-04 22:47:28 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-05-04 22:47:28 +0000 |
| commit | 9fc7e677e42f5451f933614238ec5d4f5de5ac92 (patch) | |
| tree | 9b4686a23a7d5213709edfd6fd463393db10b7af /sys/scsi/sd.c | |
| parent | 57587e34afae8d0caadcfdf23e2df5eed363538a (diff) | |
Also pass the blk offset to disk_unbusy(), so that it can pass it to
the random subsystem as entropy. This value is pretty much unknown,
and anyways our entropy input ring does not saturate from knowns.
ok mikeb djm
Diffstat (limited to 'sys/scsi/sd.c')
| -rw-r--r-- | sys/scsi/sd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 30fb36b2786..b964f803da3 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.269 2016/03/19 15:37:33 bluhm Exp $ */ +/* $OpenBSD: sd.c,v 1.270 2017/05/04 22:47:27 deraadt Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -764,7 +764,7 @@ sd_buf_done(struct scsi_xfer *xs) case XS_NO_CCB: /* The adapter is busy, requeue the buf and try it later. */ - disk_unbusy(&sc->sc_dk, bp->b_bcount - xs->resid, + disk_unbusy(&sc->sc_dk, bp->b_bcount - xs->resid, bp->b_blkno, bp->b_flags & B_READ); bufq_requeue(&sc->sc_bufq, bp); scsi_xs_put(xs); @@ -812,7 +812,7 @@ retry: break; } - disk_unbusy(&sc->sc_dk, bp->b_bcount - xs->resid, + disk_unbusy(&sc->sc_dk, bp->b_bcount - xs->resid, bp->b_blkno, bp->b_flags & B_READ); s = splbio(); |