From e060b6bd036186ebaf20aa402eb69ffd7c243194 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Thu, 11 Sep 2003 00:49:02 +0000 Subject: [PATCH] Reorder a couple of KASSERTS to give more sensible messages. Found by: GEOM 101 class of '03 --- sys/geom/geom_io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c index 65828d9b6df..db3e7431e42 100644 --- a/sys/geom/geom_io.c +++ b/sys/geom/geom_io.c @@ -236,10 +236,10 @@ g_io_request(struct bio *bp, struct g_consumer *cp) { struct g_provider *pp; - pp = cp->provider; KASSERT(cp != NULL, ("NULL cp in g_io_request")); KASSERT(bp != NULL, ("NULL bp in g_io_request")); KASSERT(bp->bio_data != NULL, ("NULL bp->data in g_io_request")); + pp = cp->provider; KASSERT(pp != NULL, ("consumer not attached in g_io_request")); bp->bio_from = cp; @@ -267,9 +267,9 @@ g_io_deliver(struct bio *bp, int error) struct g_consumer *cp; struct g_provider *pp; + KASSERT(bp != NULL, ("NULL bp in g_io_deliver")); cp = bp->bio_from; pp = bp->bio_to; - KASSERT(bp != NULL, ("NULL bp in g_io_deliver")); KASSERT(cp != NULL, ("NULL bio_from in g_io_deliver")); KASSERT(cp->geom != NULL, ("NULL bio_from->geom in g_io_deliver")); KASSERT(pp != NULL, ("NULL bio_to in g_io_deliver"));