d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dont try to finish devstat's if the disk pointer is NULL, this can happen

Browse Source 
when a disk has been destroyed but still has outstanding bio's.

Reviewed by:	phk
This commit is contained in:
Søren Schmidt 2004-05-11 13:17:40 +00:00
parent 7076971c1a
commit bbf15239ed
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=129116
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/geom/geom_disk.c
View File

@ -189,7 +189,6 @@ g_disk_done(struct bio *bp)
bp->bio_completed = bp->bio_length - bp->bio_resid;
bp2 = bp->bio_parent;
dp = bp2->bio_to->geom->softc;
if (bp2->bio_error == 0)
bp2->bio_error = bp->bio_error;
bp2->bio_completed += bp->bio_completed;
@ -197,7 +196,8 @@ g_disk_done(struct bio *bp)
bp2->bio_inbed++;
if (bp2->bio_children == bp2->bio_inbed) {
bp2->bio_resid = bp2->bio_bcount - bp2->bio_completed;
devstat_end_transaction_bio(dp->d_devstat, bp2);
if ((dp = bp2->bio_to->geom->softc))
devstat_end_transaction_bio(dp->d_devstat, bp2);
g_io_deliver(bp2, bp2->bio_error);
}
mtx_unlock(&g_disk_done_mtx);