From: Mike Snitzer <snitzer@xxxxxxxxxx>
Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
Signed-off-by: Matthew Sakai <msakai@xxxxxxxxxx>
---
drivers/md/dm-vdo/Makefile | 2 +-
drivers/md/dm-vdo/config.c | 2 +-
drivers/md/dm-vdo/funnel-requestqueue.c | 2 +-
drivers/md/dm-vdo/index-page-map.c | 2 +-
drivers/md/dm-vdo/index-session.h | 2 +-
drivers/md/dm-vdo/logger.c | 2 +-
drivers/md/dm-vdo/status-codes.c | 2 +-
drivers/md/dm-vdo/thread-cond-var.c | 2 +-
drivers/md/dm-vdo/{uds-threads.c => thread-utils.c} | 2 +-
drivers/md/dm-vdo/{uds-threads.h => thread-utils.h} | 5 ++---
drivers/md/dm-vdo/volume-index.c | 2 +-
drivers/md/dm-vdo/volume-index.h | 2 +-
drivers/md/dm-vdo/volume.c | 2 +-
drivers/md/dm-vdo/volume.h | 2 +-
14 files changed, 15 insertions(+), 16 deletions(-)
rename drivers/md/dm-vdo/{uds-threads.c => thread-utils.c} (99%)
rename drivers/md/dm-vdo/{uds-threads.h => thread-utils.h} (94%)
diff --git a/drivers/md/dm-vdo/Makefile b/drivers/md/dm-vdo/Makefile
index 8c06c3b969e3..be5020b81c47 100644
--- 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 e9c7e9bdbce0..0bf315e7b5d1 100644
--- 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 c8ba04c1089c..e7a3a4962295 100644
--- 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 f3748a915c03..8441f86ef3a4 100644
--- 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 c77ee021d510..62a9020dd9fa 100644
--- 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 1efbf8d52f2c..ff1c570f81bf 100644
--- 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 b4d7eb7f94ff..d77bc5e4a99a 100644
--- 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 ed7f0b79ca0a..82b80338b448 100644
--- 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 3bfd22bae8b1..1a1eb9ae9e33 100644
--- 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 2a0580e4482b..30637dd264cc 100644
--- 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 eebc19fe7d6f..daeafe7691ea 100644
--- 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 537e9947cf4a..2eb2cee7ee58 100644
--- 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 8bd64057c2ca..5b3cb5d89e47 100644
--- 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 066680282340..7ef9945d8403 100644
--- 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
--
2.42.0
