dm vdo: rename uds-threads.[ch] to thread-utils.[ch]

Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Matthew Sakai <msakai@redhat.com>

diff --git a/drivers/md/dm-vdo/Makefile b/drivers/md/dm-vdo/Makefile
index 8c06c3b969e3ef7892ca653cdd92574f2c498c5c..be5020b81c475db09e55b4fd53ca09f3fae417a3 100644 (file)
--- a/drivers/md/dm-vdo/Makefile
+++ b/drivers/md/dm-vdo/Makefile
@@ -51,8 +51,8 @@ dm-vdo-objs := \
        thread-cond-var.o \
        thread-device.o \
        thread-registry.o \
+       thread-utils.o \
        uds-sysfs.o \
-       uds-threads.o \
        vdo.o \
        vio.o \
        volume-index.o \

diff --git a/drivers/md/dm-vdo/config.c b/drivers/md/dm-vdo/config.c
index e9c7e9bdbce064cfed07c25a285616c084364592..0bf315e7b5d130ab58cc109c15604a1ee0d7a492 100644 (file)
--- a/drivers/md/dm-vdo/config.c
+++ b/drivers/md/dm-vdo/config.c
@@ -9,7 +9,7 @@
 #include "memory-alloc.h"
 #include "numeric.h"
 #include "string-utils.h"
-#include "uds-threads.h"
+#include "thread-utils.h"
 
 static const u8 INDEX_CONFIG_MAGIC[] = "ALBIC";
 static const u8 INDEX_CONFIG_VERSION_6_02[] = "06.02";

diff --git a/drivers/md/dm-vdo/funnel-requestqueue.c b/drivers/md/dm-vdo/funnel-requestqueue.c
index c8ba04c1089c7c424eb670fa1464b251f23d40fa..e7a3a49622959bbd871d7e0a4d26bcd62b07ff87 100644 (file)
--- a/drivers/md/dm-vdo/funnel-requestqueue.c
+++ b/drivers/md/dm-vdo/funnel-requestqueue.c
@@ -12,7 +12,7 @@
 #include "funnel-queue.h"
 #include "logger.h"
 #include "memory-alloc.h"
-#include "uds-threads.h"
+#include "thread-utils.h"
 
 /*
  * This queue will attempt to handle requests in reasonably sized batches instead of reacting

diff --git a/drivers/md/dm-vdo/index-page-map.c b/drivers/md/dm-vdo/index-page-map.c
index f3748a915c03bd51a13b64a254217d159692836b..8441f86ef3a4e0efa262d6afd4caf3641d2416d2 100644 (file)
--- a/drivers/md/dm-vdo/index-page-map.c
+++ b/drivers/md/dm-vdo/index-page-map.c
@@ -12,7 +12,7 @@
 #include "numeric.h"
 #include "permassert.h"
 #include "string-utils.h"
-#include "uds-threads.h"
+#include "thread-utils.h"
 #include "uds.h"
 
 /*

diff --git a/drivers/md/dm-vdo/index-session.h b/drivers/md/dm-vdo/index-session.h
index c77ee021d510df2badc1bd5724e7ccf1f5e76e3b..62a9020dd9fa84bc4065eb3a505660422b127e84 100644 (file)
--- a/drivers/md/dm-vdo/index-session.h
+++ b/drivers/md/dm-vdo/index-session.h
@@ -10,7 +10,7 @@
 #include <linux/cache.h>
 
 #include "config.h"
-#include "uds-threads.h"
+#include "thread-utils.h"
 #include "uds.h"
 
 /*

diff --git a/drivers/md/dm-vdo/logger.c b/drivers/md/dm-vdo/logger.c
index 1efbf8d52f2cfdc050bf45729e133b67a422c90f..ff1c570f81bf5de5f9ada49d40859991a8f5b477 100644 (file)
--- a/drivers/md/dm-vdo/logger.c
+++ b/drivers/md/dm-vdo/logger.c
@@ -12,7 +12,7 @@
 #include <linux/sched.h>
 
 #include "thread-device.h"
-#include "uds-threads.h"
+#include "thread-utils.h"
 
 struct priority_name {
        const char *name;

diff --git a/drivers/md/dm-vdo/status-codes.c b/drivers/md/dm-vdo/status-codes.c
index b4d7eb7f94ff067f85e3ad56287ca602051c47fa..d77bc5e4a99a3f61ed222d9198f9e50308981d2a 100644 (file)
--- a/drivers/md/dm-vdo/status-codes.c
+++ b/drivers/md/dm-vdo/status-codes.c
@@ -8,7 +8,7 @@
 #include "errors.h"
 #include "logger.h"
 #include "permassert.h"
-#include "uds-threads.h"
+#include "thread-utils.h"
 
 const struct error_info vdo_status_list[] = {
        { "VDO_NOT_IMPLEMENTED", "Not implemented" },

diff --git a/drivers/md/dm-vdo/thread-cond-var.c b/drivers/md/dm-vdo/thread-cond-var.c
index ed7f0b79ca0a89d179b4b2699d324e08dabc4073..82b80338b448915745a4d399fb34a4dad04e84a9 100644 (file)
--- a/drivers/md/dm-vdo/thread-cond-var.c
+++ b/drivers/md/dm-vdo/thread-cond-var.c
@@ -7,8 +7,8 @@
 #include <linux/minmax.h>
 
 #include "errors.h"
+#include "thread-utils.h"
 #include "time-utils.h"
-#include "uds-threads.h"
 
 int uds_init_cond(struct cond_var *cv)
 {

diff --git a/drivers/md/dm-vdo/uds-threads.c b/drivers/md/dm-vdo/thread-utils.c
similarity index 99%
rename from drivers/md/dm-vdo/uds-threads.c
rename to drivers/md/dm-vdo/thread-utils.c
index 3bfd22bae8b12afa6b3bc43be0833c3bfda37c1e..1a1eb9ae9e332172ac6dadefd7fda0117382c166 100644 (file)
--- a/drivers/md/dm-vdo/uds-threads.c
+++ b/drivers/md/dm-vdo/thread-utils.c
@@ -3,7 +3,7 @@
  * Copyright 2023 Red Hat
  */
 
-#include "uds-threads.h"
+#include "thread-utils.h"
 
 #include <linux/completion.h>
 #include <linux/delay.h>

diff --git a/drivers/md/dm-vdo/uds-threads.h b/drivers/md/dm-vdo/thread-utils.h
similarity index 94%
rename from drivers/md/dm-vdo/uds-threads.h
rename to drivers/md/dm-vdo/thread-utils.h
index 2a0580e4482b02c356abb75bce84a449bb18a0db..30637dd264cc8649549a90b21d718ba6cf07840b 100644 (file)
--- a/drivers/md/dm-vdo/uds-threads.h
+++ b/drivers/md/dm-vdo/thread-utils.h
@@ -3,8 +3,8 @@
  * Copyright 2023 Red Hat
  */
 
-#ifndef UDS_THREADS_H
-#define UDS_THREADS_H
+#ifndef THREAD_UTILS_H
+#define THREAD_UTILS_H
 
 #include <linux/atomic.h>
 #include <linux/delay.h>
@@ -14,7 +14,6 @@
 #include <linux/wait.h>
 
 #include "errors.h"
-#include "time-utils.h"
 
 /* Thread and synchronization utilities for UDS */
 

diff --git a/drivers/md/dm-vdo/volume-index.c b/drivers/md/dm-vdo/volume-index.c
index eebc19fe7d6f10fe6e142657065a570bb0ce5e34..daeafe7691eaee50392857dd1f65266823a43f55 100644 (file)
--- a/drivers/md/dm-vdo/volume-index.c
+++ b/drivers/md/dm-vdo/volume-index.c
@@ -18,8 +18,8 @@
 #include "memory-alloc.h"
 #include "numeric.h"
 #include "permassert.h"
+#include "thread-utils.h"
 #include "uds.h"
-#include "uds-threads.h"
 
 /*
  * The volume index is a combination of two separate subindexes, one containing sparse hook entries

diff --git a/drivers/md/dm-vdo/volume-index.h b/drivers/md/dm-vdo/volume-index.h
index 537e9947cf4a3a99e53d03c9580b3d4d5227e9d9..2eb2cee7ee5884f2b3079b6965c178f14210daa7 100644 (file)
--- a/drivers/md/dm-vdo/volume-index.h
+++ b/drivers/md/dm-vdo/volume-index.h
@@ -10,8 +10,8 @@
 
 #include "config.h"
 #include "delta-index.h"
+#include "thread-utils.h"
 #include "uds.h"
-#include "uds-threads.h"
 
 /*
  * The volume index is the primary top-level index for UDS. It contains records which map a record

diff --git a/drivers/md/dm-vdo/volume.c b/drivers/md/dm-vdo/volume.c
index 8bd64057c2ca6321b6ffbaefd50b6d6a5db0cc3f..5b3cb5d89e47ec7b40c458c59ac8eb28aa6546ee 100644 (file)
--- a/drivers/md/dm-vdo/volume.c
+++ b/drivers/md/dm-vdo/volume.c
@@ -20,7 +20,7 @@
 #include "permassert.h"
 #include "sparse-cache.h"
 #include "string-utils.h"
-#include "uds-threads.h"
+#include "thread-utils.h"
 
 /*
  * The first block of the volume layout is reserved for the volume header, which is no longer used.

diff --git a/drivers/md/dm-vdo/volume.h b/drivers/md/dm-vdo/volume.h
index 066680282340b972b74cf59914f9897d9741272a..7ef9945d84031f59fd2289bd3825aa997250b536 100644 (file)
--- a/drivers/md/dm-vdo/volume.h
+++ b/drivers/md/dm-vdo/volume.h
@@ -19,8 +19,8 @@
 #include "permassert.h"
 #include "radix-sort.h"
 #include "sparse-cache.h"
+#include "thread-utils.h"
 #include "uds.h"
-#include "uds-threads.h"
 
 /*
  * The volume manages deduplication records on permanent storage. The term "volume" can also refer