28c28
< __FBSDID("$FreeBSD: stable/11/usr.sbin/jail/command.c 298562 2016-04-25 03:24:48Z jamie $");
---
> __FBSDID("$FreeBSD: stable/11/usr.sbin/jail/command.c 302954 2016-07-17 14:06:17Z jamie $");
95c95,98
< requeue(j, &runnable);
---
> if (j->flags & JF_FROM_RUNQ)
> requeue_head(j, &runnable);
> else
> requeue(j, &runnable);
97a101
> j->flags &= ~JF_FROM_RUNQ;
162a167
> struct cfjail *rj;
168,169c173
< if (*j->comparam == IP_STOP_TIMEOUT)
< {
---
> if (*j->comparam == IP_STOP_TIMEOUT) {
175,176c179,183
< if (!TAILQ_EMPTY(&runnable))
< requeue(TAILQ_FIRST(&runnable), &ready);
---
> if (!TAILQ_EMPTY(&runnable)) {
> rj = TAILQ_FIRST(&runnable);
> rj->flags |= JF_FROM_RUNQ;
> requeue(rj, &ready);
> }
262c269
< * Run a single command for a jail, possible inside the jail.
---
> * Run a single command for a jail, possibly inside the jail.
< __FBSDID("$FreeBSD: stable/11/usr.sbin/jail/command.c 298562 2016-04-25 03:24:48Z jamie $");
---
> __FBSDID("$FreeBSD: stable/11/usr.sbin/jail/command.c 302954 2016-07-17 14:06:17Z jamie $");
95c95,98
< requeue(j, &runnable);
---
> if (j->flags & JF_FROM_RUNQ)
> requeue_head(j, &runnable);
> else
> requeue(j, &runnable);
97a101
> j->flags &= ~JF_FROM_RUNQ;
162a167
> struct cfjail *rj;
168,169c173
< if (*j->comparam == IP_STOP_TIMEOUT)
< {
---
> if (*j->comparam == IP_STOP_TIMEOUT) {
175,176c179,183
< if (!TAILQ_EMPTY(&runnable))
< requeue(TAILQ_FIRST(&runnable), &ready);
---
> if (!TAILQ_EMPTY(&runnable)) {
> rj = TAILQ_FIRST(&runnable);
> rj->flags |= JF_FROM_RUNQ;
> requeue(rj, &ready);
> }
262c269
< * Run a single command for a jail, possible inside the jail.
---
> * Run a single command for a jail, possibly inside the jail.