Attachment 147337 Details for Bug 227268 – Fix race when setting task to status to done

[patch] Fix race when setting task to status to done

autofs-5.0.1-rc3-task-done-race.patch (text/plain), 1.08 KB, created by Ian Kent on 2007-02-05 03:01:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Kent

Created: 2007-02-05 03:01:38 UTC

Size: 1.08 KB

patch

obsolete

>diff --git a/daemon/state.c b/daemon/state.c
>index d5eca8b..fb00e55 100644
>--- a/daemon/state.c
>+++ b/daemon/state.c
>@@ -190,10 +190,10 @@ void expire_cleanup(void *arg)
> 	if (next != ST_INVAL)
> 		nextstate(statefd, next);
> 
>-	state_mutex_unlock(ap);
>-
> 	st_set_done(ap);
> 
>+	state_mutex_unlock(ap);
>+
> 	return;
> }
> 
>@@ -326,11 +326,10 @@ static void do_readmap_cleanup(void *arg)
> 	state_mutex_lock(ap);
> 
> 	nextstate(ap->state_pipe[1], ST_READY);
>+	st_set_done(ap);
> 
> 	state_mutex_unlock(ap);
> 
>-	st_set_done(ap);
>-
> 	if (!ap->submount)
> 		alarm_add(ap, ap->exp_runfreq);
> 
>@@ -723,7 +722,7 @@ int st_add_task(struct autofs_point *ap, enum states state)
> 		empty = 0;
> 
> 		/* Don't add duplicate tasks */
>-		if (task->state == state ||
>+		if ((task->state == state && !task->done) ||
> 		   (ap_state == ST_SHUTDOWN_PENDING ||
> 		    ap_state == ST_SHUTDOWN_FORCE))
> 			break;
>@@ -888,6 +887,7 @@ static void st_set_thid(struct autofs_point *ap, pthread_t thid)
> 	return;
> }
> 
>+/* Requires state mutex to be held */
> static void st_set_done(struct autofs_point *ap)
> {
> 	struct list_head *p, *head;

Actions: View | Diff

Attachments on bug 227268: 147337