[src/trunk]: src/sys/external/bsd/common/linux Merge two similar branches.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9d67bad4ebe4
branches:  trunk
changeset: 366362:9d67bad4ebe4
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 15:04:19 2018 +0000

description:
Merge two similar branches.

diffstat:

 sys/external/bsd/common/linux/linux_work.c |  39 +++++++++--------------------
 1 files changed, 12 insertions(+), 27 deletions(-)

diffs (68 lines):

diff -r 1d9d82251eac -r 9d67bad4ebe4 sys/external/bsd/common/linux/linux_work.c
--- a/sys/external/bsd/common/linux/linux_work.c        Mon Aug 27 15:03:59 2018 +0000
+++ b/sys/external/bsd/common/linux/linux_work.c        Mon Aug 27 15:04:19 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_work.c,v 1.31 2018/08/27 15:03:59 riastradh Exp $        */
+/*     $NetBSD: linux_work.c,v 1.32 2018/08/27 15:04:19 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.31 2018/08/27 15:03:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.32 2018/08/27 15:04:19 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/atomic.h>
@@ -774,31 +774,11 @@
                         * It is not scheduled: it is on the queue or
                         * it is running or both.
                         */
-                       if (wq->wq_current_work != &dw->work) {
-                               /* It is on the queue and not yet running.  */
-                               if (ticks == 0) {
-                                       /*
-                                        * We ask it to run
-                                        * immediately.  Leave it on
-                                        * the queue.
-                                        */
-                               } else {
-                                       /*
-                                        * Take it off the queue and
-                                        * schedule a callout to run it
-                                        * after a delay.
-                                        */
-                                       TAILQ_REMOVE(&wq->wq_queue, &dw->work,
-                                           work_entry);
-                                       dw_callout_init(wq, dw);
-                                       callout_schedule(&dw->dw_callout,
-                                           MIN(INT_MAX, ticks));
-                               }
-                               timer_modified = true;
-                       } else if (wq->wq_requeued) {
+                       if (wq->wq_current_work != &dw->work ||
+                           wq->wq_requeued) {
                                /*
-                                * It is currently running _and_ it is
-                                * on the queue again.
+                                * It is on the queue, and it may or
+                                * may not be running.
                                 */
                                if (ticks == 0) {
                                        /*
@@ -812,7 +792,12 @@
                                         * schedule a callout to run it
                                         * after a delay.
                                         */
-                                       wq->wq_requeued = false;
+                                       if (wq->wq_requeued) {
+                                               wq->wq_requeued = false;
+                                       } else {
+                                               KASSERT(wq->wq_current_work !=
+                                                   &dw->work);
+                                       }
                                        TAILQ_REMOVE(&wq->wq_queue, &dw->work,
                                            work_entry);
                                        dw_callout_init(wq, dw);