@@ -13,11 +13,11 @@
#include "constants.h"
#include "data-vio.h"
#include "dedupe.h"
+#include "funnel-workqueue.h"
#include "io-submitter.h"
#include "logger.h"
#include "types.h"
#include "vdo.h"
-#include "work-queue.h"
enum dump_options {
/* Work queues */
@@ -6,10 +6,10 @@
#ifndef VDO_FLUSH_H
#define VDO_FLUSH_H
+#include "funnel-workqueue.h"
#include "types.h"
#include "vio.h"
#include "wait-queue.h"
-#include "work-queue.h"
/* A marker for tracking which journal entries are affected by a flush request. */
struct vdo_flush {
similarity index 99%
rename from drivers/md/dm-vdo/request-queue.c
rename to drivers/md/dm-vdo/funnel-requestqueue.c
@@ -3,7 +3,7 @@
* Copyright 2023 Red Hat
*/
-#include "request-queue.h"
+#include "funnel-requestqueue.h"
#include <linux/atomic.h>
#include <linux/compiler.h>
similarity index 100%
rename from drivers/md/dm-vdo/request-queue.h
rename to drivers/md/dm-vdo/funnel-requestqueue.h
similarity index 99%
rename from drivers/md/dm-vdo/work-queue.c
rename to drivers/md/dm-vdo/funnel-workqueue.c
@@ -3,7 +3,7 @@
* Copyright 2023 Red Hat
*/
-#include "work-queue.h"
+#include "funnel-workqueue.h"
#include <linux/atomic.h>
#include <linux/cache.h>
similarity index 100%
rename from drivers/md/dm-vdo/work-queue.h
rename to drivers/md/dm-vdo/funnel-workqueue.h
@@ -7,11 +7,11 @@
#include <linux/atomic.h>
+#include "funnel-requestqueue.h"
#include "index.h"
#include "index-layout.h"
#include "logger.h"
#include "memory-alloc.h"
-#include "request-queue.h"
#include "time-utils.h"
/*
@@ -6,10 +6,10 @@
#include "index.h"
+#include "funnel-requestqueue.h"
#include "hash-utils.h"
#include "logger.h"
#include "memory-alloc.h"
-#include "request-queue.h"
#include "sparse-cache.h"
static const u64 NO_LAST_SAVE = U64_MAX;
@@ -48,6 +48,7 @@
#include "data-vio.h"
#include "dedupe.h"
#include "encodings.h"
+#include "funnel-workqueue.h"
#include "io-submitter.h"
#include "logical-zone.h"
#include "packer.h"
@@ -58,7 +59,6 @@
#include "statistics.h"
#include "status-codes.h"
#include "vio.h"
-#include "work-queue.h"
enum { PARANOID_THREAD_CONSISTENCY_CHECKS = 0 };
@@ -16,13 +16,13 @@
#include "admin-state.h"
#include "encodings.h"
+#include "funnel-workqueue.h"
#include "packer.h"
#include "physical-zone.h"
#include "statistics.h"
#include "thread-registry.h"
#include "types.h"
#include "uds.h"
-#include "work-queue.h"
enum notifier_state {
/** Notifications are allowed but not in progress */