Author: smh
Date: Mon Nov 23 12:17:46 2015
New Revision: 291195
URL: https://svnweb.freebsd.org/changeset/base/291195
Log:
MFC r290406:
Fix g_eli error loss conditions
Sponsored by: Multiplay
Modified:
stable/10/sys/geom/eli/g_eli.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/geom/eli/g_eli.c
==============================================================================
--- stable/10/sys/geom/eli/g_eli.c Mon Nov 23 12:10:29 2015
(r291194)
+++ stable/10/sys/geom/eli/g_eli.c Mon Nov 23 12:17:46 2015
(r291195)
@@ -201,7 +201,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);
/*
@@ -212,7 +212,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);
@@ -241,10 +242,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?
@@ -255,14 +254,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);
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
