Fix g_eli error loss conditions

* Ensure that error information isn't lost.
* Log the error code in all cases.
* Don't overwrite bio_completed set to 0 from the error condition.

MFC after:	2 weeks
Sponsored by:	Multiplay

diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c
index 14fc17bc2323cfdcfb796a222e3ed813fd1655a3..57adc40addc8a21642d31d7e796aeb46f222d4ed 100644 (file)
--- a/sys/geom/eli/g_eli.c
+++ b/sys/geom/eli/g_eli.c
@@ -195,7 +195,7 @@ g_eli_read_done(struct bio *bp)
 
        G_ELI_LOGREQ(2, bp, "Request done.");
        pbp = bp->bio_parent;
-       if (pbp->bio_error == 0)
+       if (pbp->bio_error == 0 && bp->bio_error != 0)
                pbp->bio_error = bp->bio_error;
        g_destroy_bio(bp);
        /*
@@ -206,7 +206,8 @@ g_eli_read_done(struct bio *bp)
                return;
        sc = pbp->bio_to->geom->softc;
        if (pbp->bio_error != 0) {
-               G_ELI_LOGREQ(0, pbp, "%s() failed", __func__);
+               G_ELI_LOGREQ(0, pbp, "%s() failed (error=%d)", __func__,
+                   pbp->bio_error);
                pbp->bio_completed = 0;
                if (pbp->bio_driver2 != NULL) {
                        free(pbp->bio_driver2, M_ELI);
@@ -235,10 +236,8 @@ g_eli_write_done(struct bio *bp)
 
        G_ELI_LOGREQ(2, bp, "Request done.");
        pbp = bp->bio_parent;
-       if (pbp->bio_error == 0) {
-               if (bp->bio_error != 0)
-                       pbp->bio_error = bp->bio_error;
-       }
+       if (pbp->bio_error == 0 && bp->bio_error != 0)
+               pbp->bio_error = bp->bio_error;
        g_destroy_bio(bp);
        /*
         * Do we have all sectors already?
@@ -249,14 +248,15 @@ g_eli_write_done(struct bio *bp)
        free(pbp->bio_driver2, M_ELI);
        pbp->bio_driver2 = NULL;
        if (pbp->bio_error != 0) {
-               G_ELI_LOGREQ(0, pbp, "Crypto WRITE request failed (error=%d).",
+               G_ELI_LOGREQ(0, pbp, "%s() failed (error=%d)", __func__,
                    pbp->bio_error);
                pbp->bio_completed = 0;
-       }
+       } else
+               pbp->bio_completed = pbp->bio_length;
+
        /*
         * Write is finished, send it up.
         */
-       pbp->bio_completed = pbp->bio_length;
        sc = pbp->bio_to->geom->softc;
        g_io_deliver(pbp, pbp->bio_error);
        atomic_subtract_int(&sc->sc_inflight, 1);