 @@ -1,14 +1,14 @@
-/*	$NetBSD: workqueue.h,v 1.16 2021/12/19 01:03:57 riastradh Exp $	*/
+/*	$NetBSD: workqueue.h,v 1.17 2021/12/19 01:04:05 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013, 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -35,41 +35,43 @@
 #include <sys/queue.h>
 #include <sys/stdbool.h>
 #include <linux/kernel.h>	/* container_of */
 #define	INIT_DELAYED_WORK		linux_INIT_DELAYED_WORK
 #define	INIT_WORK			linux_INIT_WORK
 #define	alloc_ordered_workqueue		linux_alloc_ordered_workqueue
 #define	cancel_delayed_work		linux_cancel_delayed_work
 #define	cancel_delayed_work_sync	linux_cancel_delayed_work_sync
 #define	cancel_work			linux_cancel_work
 #define	cancel_work_sync		linux_cancel_work_sync
 #define	current_work			linux_current_work
 #define	delayed_work_pending		linux_delayed_work_pending
 #define	destroy_workqueue		linux_destroy_workqueue
 #define	flush_delayed_work		linux_flush_delayed_work
 #define	flush_scheduled_work		linux_flush_scheduled_work
 #define	flush_work			linux_flush_work
 #define	flush_workqueue			linux_flush_workqueue
 #define	queue_delayed_work		linux_queue_delayed_work
 #define	mod_delayed_work		linux_mod_delayed_work
 #define	queue_work			linux_queue_work
 #define	schedule_delayed_work		linux_schedule_delayed_work
 #define	schedule_work			linux_schedule_work
 #define	system_long_wq			linux_system_long_wq
 #define	system_power_efficient_wq	linux_system_power_efficient_wq
 #define	system_unbound_wq		linux_system_unbound_wq
 #define	system_wq			linux_system_wq
 #define	to_delayed_work			linux_to_delayed_work
 #define	work_pending			linux_work_pending
 struct workqueue_struct;
 struct work_struct {
 	volatile uintptr_t		work_owner;
 	TAILQ_ENTRY(work_struct)	work_entry;
 	void	(*func)(struct work_struct *); /* Linux API name */
 };
 struct delayed_work {
 	struct work_struct		work; /* Linux API name */
 	struct callout			dw_callout;
 	TAILQ_ENTRY(delayed_work)	dw_entry;
 @@ -101,36 +103,38 @@ void	linux_workqueue_fini(void);
 struct workqueue_struct *
 	alloc_ordered_workqueue(const char *, int);
 void	destroy_workqueue(struct workqueue_struct *);
 void	flush_workqueue(struct workqueue_struct *);
 void	flush_scheduled_work(void);
 void	INIT_WORK(struct work_struct *, void (*)(struct work_struct *));
 bool	schedule_work(struct work_struct *);
 bool	queue_work(struct workqueue_struct *, struct work_struct *);
 bool	cancel_work(struct work_struct *);
 bool	cancel_work_sync(struct work_struct *);
 bool	flush_work(struct work_struct *);
 bool	work_pending(struct work_struct *);
 void	INIT_DELAYED_WORK(struct delayed_work *,
 	    void (*)(struct work_struct *));
 bool	schedule_delayed_work(struct delayed_work *, unsigned long);
 bool	queue_delayed_work(struct workqueue_struct *, struct delayed_work *,
 	    unsigned long ticks);
 bool	mod_delayed_work(struct workqueue_struct *, struct delayed_work *,
 	    unsigned long ticks);
 bool	cancel_delayed_work(struct delayed_work *);
 bool	cancel_delayed_work_sync(struct delayed_work *);
 bool	flush_delayed_work(struct delayed_work *);
 bool	delayed_work_pending(struct delayed_work *);
 struct work_struct *
 	current_work(void);
 #define	INIT_WORK_ONSTACK		INIT_WORK
 static inline void
 destroy_work_on_stack(struct work_struct *work)
+{
+}
 #endif  /* _LINUX_WORKQUEUE_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_work.c,v 1.48 2021/12/19 01:03:57 riastradh Exp $	*/
+/*	$NetBSD: linux_work.c,v 1.49 2021/12/19 01:04:05 riastradh Exp $	*/
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.48 2021/12/19 01:03:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.49 2021/12/19 01:04:05 riastradh Exp $");
 #include <sys/types.h>
 #include <sys/atomic.h>
 #include <sys/callout.h>
 #include <sys/condvar.h>
 #include <sys/errno.h>
 #include <sys/kmem.h>
 #include <sys/kthread.h>
 #include <sys/lwp.h>
 #include <sys/mutex.h>
 #ifndef _MODULE
 #include <sys/once.h>
 #endif
 @@ -528,26 +528,39 @@ INIT_WORK(struct work_struct *work, void
  *	must be wq, and caller must hold wq's lock.
  */
 static bool
 work_claimed(struct work_struct *work, struct workqueue_struct *wq)
+{
 	KASSERT(work_queue(work) == wq);
 	KASSERT(mutex_owned(&wq->wq_lock));
 	return work->work_owner & 1;
+}
 /*
  * work_pending(work)
+ *
  *	True if work is currently claimed by any workqueue, scheduled
  *	to run on that workqueue.
  */
 bool
 work_pending(struct work_struct *work)
+{
 	return work->work_owner & 1;
+}
 /*
  * work_queue(work)
+ *
  *	Return the last queue that work was queued on, or NULL if it
  *	was never queued.
  */
 static struct workqueue_struct *
 work_queue(struct work_struct *work)
+{
 	return (struct workqueue_struct *)(work->work_owner & ~(uintptr_t)1);
+}
 /*
 @@ -1516,13 +1529,25 @@ flush_delayed_work(struct delayed_work *
 			panic("invalid delayed work state: %d", dw->dw_state);
+		}
 		/*
 		 * Waiting for the whole queue to flush is overkill,
 		 * but doesn't hurt.
 		 */
 		flush_workqueue_locked(wq);
 		waited = true;
+	}
 	mutex_exit(&wq->wq_lock);
 	return waited;
+}
 /*
  * delayed_work_pending(dw)
+ *
  *	True if dw is currently scheduled to execute, false if not.
  */
 bool
 delayed_work_pending(struct delayed_work *dw)
+{
 	return work_pending(&dw->work);
+}