summaryrefslogtreecommitdiffstats
path: root/sys/geom/geom_subr.c
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-09-30 08:54:46 +0000
committerphk <phk@FreeBSD.org>2002-09-30 08:54:46 +0000
commit852521acba9ca655f9805890d434284e77dc3553 (patch)
treeaecab093ebd65e53e9ed7f0ce1ad3248a7fb3cb0 /sys/geom/geom_subr.c
parent72d7c1eb0e7571a3a567c7dcb80c59931eb6545d (diff)
downloadFreeBSD-src-852521acba9ca655f9805890d434284e77dc3553.zip
FreeBSD-src-852521acba9ca655f9805890d434284e77dc3553.tar.gz
Retire g_io_fail() and let g_io_deliver() take an error argument instead.
Sponsored by: DARPA & NAI Labs.
Diffstat (limited to 'sys/geom/geom_subr.c')
-rw-r--r--sys/geom/geom_subr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c
index 25f6a0c..bfb0732 100644
--- a/sys/geom/geom_subr.c
+++ b/sys/geom/geom_subr.c
@@ -479,8 +479,7 @@ g_handleattr(struct bio *bp, char *attribute, void *val, int len)
bcopy(val, bp->bio_data, len);
bp->bio_completed = len;
}
- bp->bio_error = error;
- g_io_deliver(bp);
+ g_io_deliver(bp, error);
return (1);
}
@@ -496,12 +495,13 @@ void
g_std_done(struct bio *bp)
{
struct bio *bp2;
+ int error;
bp2 = bp->bio_linkage;
- bp2->bio_error = bp->bio_error;
+ error = bp->bio_error;
bp2->bio_completed = bp->bio_completed;
g_destroy_bio(bp);
- g_io_deliver(bp2);
+ g_io_deliver(bp2, error);
}
/* XXX: maybe this is only g_slice_spoiled */
OpenPOWER on IntegriCloud