X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=b401b078f2a09f819b26981bd1111faa5e6bbdaa;hp=8c57b3bde28fc45d2337f316a0c7cf8d41f4d112;hb=1995ceed8d70a5b50dbf84ca4132a8c318afa51b;hpb=216399fa29e2c071cd4485c57b6b1c9f4a74057b diff --git a/write.c b/write.c index 8c57b3bd..b401b078 100644 --- a/write.c +++ b/write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2012 Andre Noll + * Copyright (C) 2005-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -86,10 +86,10 @@ static void write_pre_select(struct sched *s, struct task *t) check_wav_pre_select(s, wt->cwc); } -static void write_post_select(__a_unused struct sched *s, struct task *t) +static int write_post_select(__a_unused struct sched *s, struct task *t) { struct write_task *wt = container_of(t, struct write_task, task); - t->error = check_wav_post_select(wt->cwc); + return check_wav_post_select(wt->cwc); } static int setup_and_schedule(void) @@ -102,7 +102,7 @@ static int setup_and_schedule(void) struct write_task wt = { .task = { .pre_select = write_pre_select, - .post_select = write_post_select, + .new_post_select = write_post_select, .status = "write task", }, }; @@ -114,7 +114,7 @@ static int setup_and_schedule(void) register_task(&s, &sit.task); COPY_WAV_PARMS(&wp, &conf); - wt.cwc = check_wav_init(sit.btrn, &wp, &cw_btrn); + wt.cwc = check_wav_init(sit.btrn, NULL, &wp, &cw_btrn); register_task(&s, &wt.task); if (!conf.writer_given) { wns = para_calloc(sizeof(*wns));