X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=amp_filter.c;h=71855eb2e9e5a8102d6cebf1f0c6ffd4b6180250;hp=f62ea8a2f50962182e158ce8da7f18fb4ec1df4f;hb=62c2dc7f15d4875ec86b9de7bb9a5f82413f7ac9;hpb=650e5374914c1eb725ce7d2a720611bec22112bc diff --git a/amp_filter.c b/amp_filter.c index f62ea8a2..71855eb2 100644 --- a/amp_filter.c +++ b/amp_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2013 Andre Noll + * Copyright (C) 2009-2014 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -58,13 +58,13 @@ static void amp_open(struct filter_node *fn) sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp); else pad->amp = conf->amp_arg; - PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n", + PARA_INFO_LOG("amplification: %u (scaling factor: %1.2f)\n", pad->amp, pad->amp / 64.0 + 1.0); } static int amp_post_select(__a_unused struct sched *s, struct task *t) { - struct filter_node *fn = container_of(t, struct filter_node, task); + struct filter_node *fn = task_context(t); struct private_amp_data *pad = fn->private_data; struct btr_node *btrn = fn->btrn; int ret, factor = 64 + pad->amp; @@ -73,7 +73,7 @@ static int amp_post_select(__a_unused struct sched *s, struct task *t) bool inplace = btr_inplace_ok(btrn); if (pad->amp == 0) { /* no amplification */ - btr_splice_out_node(btrn); + btr_splice_out_node(&fn->btrn); return -E_AMP_ZERO_AMP; } next_buffer: