X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=grab_client.c;h=672c96f1d6b42ac8fd75418486cdb02ce2d24395;hp=2b8c8d3e3d8e947789aa32c049403204948c1dc9;hb=d1e6b28f66e243516d01916f9125baee75dd98d6;hpb=4ac3134c050ba28b57e0ae9686eb1f6d83e6d586 diff --git a/grab_client.c b/grab_client.c index 2b8c8d3e..672c96f1 100644 --- a/grab_client.c +++ b/grab_client.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2012 Andre Noll + * Copyright (C) 2006-2014 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -108,7 +108,7 @@ static void gc_pre_select(struct sched *s, struct task *t) * We need this forward declaration as post_select() needs * activate_grab_client and vice versa. */ -static void gc_post_select(struct sched *s, struct task *t); +static int gc_post_select(struct sched *s, struct task *t); /** * Move a grab client to the active list and start it. @@ -184,7 +184,7 @@ static int gc_close(struct grab_client *gc, int err) return 0; } -static void gc_post_select(__a_unused struct sched *s, struct task *t) +static int gc_post_select(__a_unused struct sched *s, struct task *t) { struct grab_client *gc = container_of(t, struct grab_client, task); struct btr_node *btrn = gc->btrn; @@ -192,10 +192,9 @@ static void gc_post_select(__a_unused struct sched *s, struct task *t) size_t sz; char *buf; - t->error = 0; ret = btr_node_status(btrn, 0, BTR_NT_LEAF); if (ret == 0) - return; + return 0; if (ret < 0) goto err; sz = btr_next_buffer(btrn, &buf); @@ -205,10 +204,10 @@ static void gc_post_select(__a_unused struct sched *s, struct task *t) goto err; if (ret > 0) btr_consume(btrn, ret); - return; + return 0; err: gc_close(gc, ret); - t->error = ret; + return ret; } static int gc_check_args(int argc, char **argv, struct grab_client *gc)