MFprojects/camlock r256371:

Fix passing uninitialized bio_resid argument to g_trace().
This commit is contained in:
Alexander Motin 2013-10-16 09:21:40 +00:00
parent 0fd2511ae2
commit 21d0712c33
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=256607

View File

@ -485,16 +485,16 @@ g_dev_done(struct bio *bp2)
sc = cp->private;
bp = bp2->bio_parent;
bp->bio_error = bp2->bio_error;
if (bp->bio_error != 0) {
bp->bio_completed = bp2->bio_completed;
bp->bio_resid = bp2->bio_resid;
if (bp2->bio_error != 0) {
g_trace(G_T_BIO, "g_dev_done(%p) had error %d",
bp2, bp->bio_error);
bp2, bp2->bio_error);
bp->bio_flags |= BIO_ERROR;
} else {
g_trace(G_T_BIO, "g_dev_done(%p/%p) resid %ld completed %jd",
bp2, bp, bp->bio_resid, (intmax_t)bp2->bio_completed);
bp2, bp, bp2->bio_resid, (intmax_t)bp2->bio_completed);
}
bp->bio_resid = bp->bio_length - bp2->bio_completed;
bp->bio_completed = bp2->bio_completed;
g_destroy_bio(bp2);
destroy = 0;
mtx_lock(&sc->sc_mtx);