From: Andre Noll <maan@systemlinux.org>
Date: Sun, 31 Mar 2013 13:56:49 +0000 (+0000)
Subject: ao: Switch to the alternative post select method.
X-Git-Tag: v0.4.13~39^2~25
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=36875cb7db20de1f374a0e65243513408a1e340d;p=paraslash.git

ao: Switch to the alternative post select method.
---

diff --git a/ao_write.c b/ao_write.c
index ffe86699..3f681eb8 100644
--- a/ao_write.c
+++ b/ao_write.c
@@ -276,7 +276,7 @@ fail:
 	return -E_AO_PTHREAD;
 }
 
-static void aow_post_select(__a_unused struct sched *s,
+static int aow_post_select(__a_unused struct sched *s,
 		struct task *t)
 {
 	struct writer_node *wn = container_of(t, struct writer_node, task);
@@ -291,7 +291,7 @@ static void aow_post_select(__a_unused struct sched *s,
 		if (ret < 0)
 			goto remove_btrn;
 		if (ret == 0)
-			return;
+			return 0;
 		get_btr_sample_rate(wn->btrn, &rate);
 		get_btr_channels(wn->btrn, &ch);
 		get_btr_sample_format(wn->btrn, &format);
@@ -312,7 +312,7 @@ static void aow_post_select(__a_unused struct sched *s,
 		ret = aow_create_thread(wn);
 		if (ret < 0)
 			goto remove_thread_btrn;
-		return;
+		return 0;
 	}
 	pthread_mutex_lock(&pawd->mutex);
 	ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
@@ -334,7 +334,7 @@ remove_thread_btrn:
 remove_btrn:
 	btr_remove_node(&wn->btrn);
 out:
-	t->error = ret;
+	return ret;
 }
 
 __malloc static void *aow_parse_config_or_die(int argc, char **argv)
@@ -368,7 +368,8 @@ void ao_write_init(struct writer *w)
 	ao_write_cmdline_parser_init(&dummy);
 	w->close = aow_close;
 	w->pre_select = aow_pre_select;
-	w->post_select = aow_post_select;
+	w->new_post_select = aow_post_select;
+	w->post_select = NULL;
 	w->parse_config_or_die = aow_parse_config_or_die;
 	w->free_config = aow_free_config;
 	w->help = (struct ggo_help) {