X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=osx_write.c;h=a9c421a6a0a27397afbd69b302c77199c52e768b;hb=74e29e3e9f53baa879bb2f6d7aaf7448f36686a1;hp=f961ca56c610cd6f3a4aba7fe160f0016773b5c8;hpb=74c88020bd325865fe26ed25ea8ad0ace0924136;p=paraslash.git

diff --git a/osx_write.c b/osx_write.c
index f961ca56..a9c421a6 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -276,7 +276,7 @@ static inline bool need_drain_delay(struct private_osx_write_data *powd)
 
 static void osx_write_pre_select(struct sched *s, struct task *t)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = task_context(t);
 	struct private_osx_write_data *powd = wn->private_data;
 	int ret;
 	bool drain_delay_nec = false;
@@ -303,7 +303,7 @@ static void osx_write_pre_select(struct sched *s, struct task *t)
 
 static int osx_write_post_select(__a_unused struct sched *s, struct task *t)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = task_context(t);
 	struct private_osx_write_data *powd = wn->private_data;
 	struct btr_node *btrn = wn->btrn;
 	int ret;
@@ -363,12 +363,9 @@ void osx_write_init(struct writer *w)
 	osx_write_cmdline_parser_init(&dummy);
 	w->close = osx_write_close;
 	w->pre_select = osx_write_pre_select;
-	w->new_post_select = osx_write_post_select;
+	w->post_select = osx_write_post_select;
 	w->parse_config_or_die = osx_write_parse_config_or_die;
 	w->free_config = osx_free_config;
-	w->help = (struct ggo_help) {
-		.short_help = osx_write_args_info_help,
-		.detailed_help = osx_write_args_info_detailed_help
-	};
+	w->help = (struct ggo_help)DEFINE_GGO_HELP(osx_write);
 	osx_write_cmdline_parser_free(&dummy);
 }