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/arch/sparc64 | |
| 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/arch/sparc64')
| -rw-r--r-- | sys/arch/sparc64/dev/fd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c index 8c48b4ee12d..17a28a955fe 100644 --- a/sys/arch/sparc64/dev/fd.c +++ b/sys/arch/sparc64/dev/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.47 2017/04/30 16:45:45 mpi Exp $ */ +/* $OpenBSD: fd.c,v 1.48 2017/05/04 22:47:27 deraadt Exp $ */ /* $NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $ */ /*- @@ -1420,7 +1420,7 @@ loop: case DSKCHGWAIT: timeout_del(&fdc->fdctimeout_to); - disk_unbusy(&fd->sc_dk, 0, 0); + disk_unbusy(&fd->sc_dk, 0, 0, 0); if (fdc->sc_nstat != 2 || (st0 & 0xf8) != 0x20 || cyl != 1 * fd->sc_type->step) { fdcstatus(fdc, "dskchg seek failed"); @@ -1525,7 +1525,7 @@ loop: /*FALLTHROUGH*/ case SEEKCOMPLETE: /* no data on seek */ - disk_unbusy(&fd->sc_dk, 0, 0); + disk_unbusy(&fd->sc_dk, 0, 0, 0); /* Make sure seek really happened. */ if (fdc->sc_nstat != 2 || (st0 & 0xf8) != 0x20 || @@ -1570,7 +1570,7 @@ loop: case IOCLEANUPWAIT: /* IO FAILED, cleanup succeeded */ timeout_del(&fdc->fdctimeout_to); disk_unbusy(&fd->sc_dk, (bp->b_bcount - bp->b_resid), - (bp->b_flags & B_READ)); + bp->b_blkno, (bp->b_flags & B_READ)); fdcretry(fdc); goto loop; @@ -1578,7 +1578,7 @@ loop: timeout_del(&fdc->fdctimeout_to); disk_unbusy(&fd->sc_dk, (bp->b_bcount - bp->b_resid), - (bp->b_flags & B_READ)); + bp->b_blkno, (bp->b_flags & B_READ)); if (fdc->sc_nstat != 7 || st1 != 0 || ((st0 & 0xf8) != 0 && |