Attachment #185874 for bug #162036

View | Details | Raw Unified | Return to bug 162036
Collapse All | Expand All

Lines 214-220 g_eli_read_done(struct bio *bp) Link Here

(-)b/sys/geom/eli/g_eli.c (-1 / +2 lines)
214	pbp->bio_driver2 = NULL;	214	pbp->bio_driver2 = NULL;
215	}	215	}
216	g_io_deliver(pbp, pbp->bio_error);	216	g_io_deliver(pbp, pbp->bio_error);
217	atomic_subtract_int(&sc->sc_inflight, 1);	217	if (sc != NULL)
		218	atomic_subtract_int(&sc->sc_inflight, 1);
218	return;	219	return;
219	}	220	}
220	mtx_lock(&sc->sc_queue_mtx);	221	mtx_lock(&sc->sc_queue_mtx);




			bp->bio_error = crp->crp_etype;
	}
	sc = bp->bio_to->geom->softc;
	if (sc != NULL)
		g_eli_key_drop(sc, crp->crp_desc->crd_key);
	/*
	 * Do we have all sectors already?
	 */

	 * Read is finished, send it up.
	 */
	g_io_deliver(bp, bp->bio_error);
	if (sc != NULL)
		atomic_subtract_int(&sc->sc_inflight, 1);
	return (0);
}

- 
--
sys/geom/eli/g_eli.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Lines 260-266 g_eli_write_done(struct bio *bp) Link Here

(-)b/sys/geom/eli/g_eli.c (-2 / +2 lines)
260	*/	260	*/
261	sc = pbp->bio_to->geom->softc;	261	sc = pbp->bio_to->geom->softc;
262	g_io_deliver(pbp, pbp->bio_error);	262	g_io_deliver(pbp, pbp->bio_error);
263	atomic_subtract_int(&sc->sc_inflight, 1);	263	if (sc != NULL)
		264	atomic_subtract_int(&sc->sc_inflight, 1);
264	}	265	}
265		266
266	/*	267	/*
267	-

Return to bug 162036

Lines 87-93 g_eli_crypto_read_done(struct cryptop *crp) Link Here

(-)b/sys/geom/eli/g_eli_privacy.c (-4 / +4 lines)
87	bp->bio_error = crp->crp_etype;	87	bp->bio_error = crp->crp_etype;
88	}	88	}
89	sc = bp->bio_to->geom->softc;	89	sc = bp->bio_to->geom->softc;
90	g_eli_key_drop(sc, crp->crp_desc->crd_key);	90	if (sc != NULL)
		91	g_eli_key_drop(sc, crp->crp_desc->crd_key);
91	/*	92	/*
92	* Do we have all sectors already?	93	* Do we have all sectors already?
93	*/	94	*/
Lines 104-110 g_eli_crypto_read_done(struct cryptop *crp) Link Here
104	* Read is finished, send it up.	105	* Read is finished, send it up.
105	*/	106	*/
106	g_io_deliver(bp, bp->bio_error);	107	g_io_deliver(bp, bp->bio_error);
107	atomic_subtract_int(&sc->sc_inflight, 1);	108	if (sc != NULL)
		109	atomic_subtract_int(&sc->sc_inflight, 1);
108	return (0);	110	return (0);
109	}	111	}
110		112
111	-
112	--
113	sys/geom/eli/g_eli.c \| 3 ++-	113	sys/geom/eli/g_eli.c \| 3 ++-
114	1 file changed, 2 insertions(+), 1 deletion(-)	114	1 file changed, 2 insertions(+), 1 deletion(-)