helpers.c [fix]: __zio_arm_input_trigger: free blocks on raw_io error

Fix memory lost in an error condition Signed-off-by: Federico Vaga <federico.vaga@gmail.com> Acked-by: Alessandro Rubini <rubini@gnudd.com>

helpers.c [fix]: __zio_arm_input_trigger: free blocks on raw_io error
Fix memory lost in an error condition Signed-off-by: Federico Vaga <federico.vaga@gmail.com> Acked-by: Alessandro Rubini <rubini@gnudd.com>
ced9a6ff · Federico Vaga · 568bc32a · ced9a6ff
Commit ced9a6ff authored Feb 04, 2013 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

helpers.c helpers.c +10 -1

No files found.
--- a/helpers.c
+++ b/helpers.c
@@ -91,8 +91,17 @@ static int __zio_arm_input_trigger(struct zio_ti *ti)
 		chan->active_block = block;
 	}
 	i = cset->raw_io(cset);
-	if (!i)
+	if (!i) {
 		zio_trigger_data_done(cset); /* Succeeded */
+	} else if (i != -EAGAIN) {
+		/* Error: Free blocks */
+		dev_err(&ti->head.dev,
+			"raw_io failed (%i), cannot arm trigger\n", i);
+		chan_for_each(chan, cset) {
+			zbuf->b_op->free_block(chan->bi, chan->active_block);
+		}
+	}
+
 	return i;
 }