diff options
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/isa/atapi-cd.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/wd.c | 8 | ||||
-rw-r--r-- | sys/i386/isa/wd_cd.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/wfd.c | 8 |
4 files changed, 4 insertions, 20 deletions
diff --git a/sys/i386/isa/atapi-cd.c b/sys/i386/isa/atapi-cd.c index 678603f..e4b9ddc 100644 --- a/sys/i386/isa/atapi-cd.c +++ b/sys/i386/isa/atapi-cd.c @@ -546,9 +546,6 @@ static void acd_done(struct acd *cdp, struct buf *bp, int resid, struct atapires result) { - devstat_end_transaction(cdp->device_stats, bp->b_bcount - resid, - DEVSTAT_TAG_NONE, - (bp->b_flags&B_READ) ? DEVSTAT_READ:DEVSTAT_WRITE); if (result.code) { atapi_error(cdp->ata, cdp->unit, result); bp->b_error = EIO; @@ -558,6 +555,7 @@ acd_done(struct acd *cdp, struct buf *bp, int resid, struct atapires result) if ((bp->b_flags & B_READ) == B_WRITE) cdp->flags |= F_WRITTEN; } + devstat_end_transaction_buf(cdp->device_stats, bp); biodone(bp); acd_start(cdp); } diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index 76a9755..93a031e 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -1157,13 +1157,7 @@ done: ; bp->b_resid = bp->b_bcount - du->dk_skip * DEV_BSIZE; wdutab[du->dk_lunit].b_active = 0; du->dk_skip = 0; - - /* Update device stats */ - devstat_end_transaction(&du->dk_stats, - bp->b_bcount - bp->b_resid, - DEVSTAT_TAG_NONE, - (bp->b_flags & B_READ) ? DEVSTAT_READ : DEVSTAT_WRITE); - + devstat_end_transaction_buf(&du->dk_stats, bp); biodone(bp); } diff --git a/sys/i386/isa/wd_cd.c b/sys/i386/isa/wd_cd.c index 678603f..e4b9ddc 100644 --- a/sys/i386/isa/wd_cd.c +++ b/sys/i386/isa/wd_cd.c @@ -546,9 +546,6 @@ static void acd_done(struct acd *cdp, struct buf *bp, int resid, struct atapires result) { - devstat_end_transaction(cdp->device_stats, bp->b_bcount - resid, - DEVSTAT_TAG_NONE, - (bp->b_flags&B_READ) ? DEVSTAT_READ:DEVSTAT_WRITE); if (result.code) { atapi_error(cdp->ata, cdp->unit, result); bp->b_error = EIO; @@ -558,6 +555,7 @@ acd_done(struct acd *cdp, struct buf *bp, int resid, struct atapires result) if ((bp->b_flags & B_READ) == B_WRITE) cdp->flags |= F_WRITTEN; } + devstat_end_transaction_buf(cdp->device_stats, bp); biodone(bp); acd_start(cdp); } diff --git a/sys/i386/isa/wfd.c b/sys/i386/isa/wfd.c index 3a169ac..21fdb44 100644 --- a/sys/i386/isa/wfd.c +++ b/sys/i386/isa/wfd.c @@ -554,13 +554,7 @@ static void wfd_done (struct wfd *t, struct buf *bp, int resid, */ if (((int)bp->b_driver1)-- <= 0) { bp->b_resid = (int)bp->b_driver2; - - /* Tell devstat we have finished with the transaction */ - devstat_end_transaction(&t->device_stats, - bp->b_bcount - bp->b_resid, - DEVSTAT_TAG_NONE, - (bp->b_flags & B_READ) ? DEVSTAT_READ : DEVSTAT_WRITE); - + devstat_end_transaction_buf(&t->device_stats, bp); biodone (bp); } |