X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_recv.c;h=ff794852239a093903d513581d7fbed2a4c93eff;hp=89722fef5b305351bac9668c1dab966d2f8bfafe;hb=f189411b9986564c2652ef87e54189e5fa0d5d11;hpb=9c1aa53f0cda586aa13a022452d16a2704055578 diff --git a/afh_recv.c b/afh_recv.c index 89722fef..ff794852 100644 --- a/afh_recv.c +++ b/afh_recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2014 Andre Noll + * Copyright (C) 2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,7 +8,6 @@ #include #include -#include #include "para.h" #include "error.h" @@ -61,7 +60,6 @@ static int afh_execute(struct btr_node *btrn, const char *cmd, char **result) return -ERRNO_TO_PARA_ERROR(EINVAL); pard->first_chunk = afh_get_start_chunk(x, &pard->afhi); pard->current_chunk = pard->first_chunk; - rn->task.error = 0; return 1; } return -E_BTR_NAVAIL; @@ -155,14 +153,14 @@ static void afh_recv_close(struct receiver_node *rn) freep(&rn->private_data); } -static void afh_recv_pre_select(struct sched *s, struct task *t) +static void afh_recv_pre_select(struct sched *s, void *context) { - struct receiver_node *rn = container_of(t, struct receiver_node, task); + struct receiver_node *rn = context; struct private_afh_recv_data *pard = rn->private_data; struct afh_info *afhi = &pard->afhi; struct afh_recv_args_info *conf = rn->conf; struct timeval chunk_time; - int state = generic_recv_pre_select(s, t); + int state = generic_recv_pre_select(s, rn); if (state <= 0) return; @@ -175,9 +173,9 @@ static void afh_recv_pre_select(struct sched *s, struct task *t) sched_request_barrier_or_min_delay(&chunk_time, s); } -static int afh_recv_post_select(__a_unused struct sched *s, struct task *t) +static int afh_recv_post_select(__a_unused struct sched *s, void *context) { - struct receiver_node *rn = container_of(t, struct receiver_node, task); + struct receiver_node *rn = context; struct afh_recv_args_info *conf = rn->conf; struct private_afh_recv_data *pard = rn->private_data; struct btr_node *btrn = rn->btrn;