[src/trunk]: src/sys/external/bsd/common/linux Work is not necessarily queued...

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

details:   https://anonhg.NetBSD.org/src/rev/d8785a73db14
branches:  trunk
changeset: 835423:d8785a73db14
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 14:58:09 2018 +0000

description:
Work is not necessarily queued in flush_work either.

Regularize style: use initializer only if the wq is guaranteed, and
confirmed by KASSERT, to be set

diffstat:

 sys/external/bsd/common/linux/linux_work.c |  25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diffs (77 lines):

diff -r c1cd60d50098 -r d8785a73db14 sys/external/bsd/common/linux/linux_work.c
--- a/sys/external/bsd/common/linux/linux_work.c        Mon Aug 27 14:57:55 2018 +0000
+++ b/sys/external/bsd/common/linux/linux_work.c        Mon Aug 27 14:58:09 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_work.c,v 1.13 2018/08/27 14:57:55 riastradh Exp $        */
+/*     $NetBSD: linux_work.c,v 1.14 2018/08/27 14:58:09 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.13 2018/08/27 14:57:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.14 2018/08/27 14:58:09 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/atomic.h>
@@ -259,6 +259,7 @@
        struct workqueue_struct *const wq = dw->work.work_queue;
 
        KASSERT(wq != NULL);
+
        mutex_enter(&wq->wq_lock);
        switch (dw->dw_state) {
        case DELAYED_WORK_IDLE:
@@ -552,7 +553,10 @@
        struct workqueue_struct *wq;
        bool cancelled_p;
 
-       wq = dw->work.work_queue;
+       /* If there's no workqueue, nothing to cancel.   */
+       if ((wq = dw->work.work_queue) == NULL)
+               return false;
+
        mutex_enter(&wq->wq_lock);
        if (__predict_false(dw->work.work_queue != wq)) {
                cancelled_p = false;
@@ -602,7 +606,10 @@
        struct workqueue_struct *wq;
        bool cancelled_p;
 
-       wq = dw->work.work_queue;
+       /* If there's no workqueue, nothing to cancel.   */
+       if ((wq = dw->work.work_queue) == NULL)
+               return false;
+
        mutex_enter(&wq->wq_lock);
        if (__predict_false(dw->work.work_queue != wq)) {
                cancelled_p = false;
@@ -671,9 +678,10 @@
 bool
 flush_work(struct work_struct *work)
 {
-       struct workqueue_struct *const wq = work->work_queue;
+       struct workqueue_struct *wq;
 
-       if (wq == NULL)
+       /* If there's no workqueue, nothing to flush.  */
+       if ((wq = work->work_queue) == NULL)
                return false;
 
        flush_workqueue(wq);
@@ -683,10 +691,11 @@
 bool
 flush_delayed_work(struct delayed_work *dw)
 {
-       struct workqueue_struct *const wq = dw->work.work_queue;
+       struct workqueue_struct *wq;
        bool do_flush = false;
 
-       if (wq == NULL)
+       /* If there's no workqueue, nothing to flush.  */
+       if ((wq = dw->work.work_queue) == NULL)
                return false;
 
        mutex_enter(&wq->wq_lock);