From: Mike Snitzer <snitzer@xxxxxxxxxx>
Also remove unnecessary include from funnel-queue.c.
Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
Signed-off-by: Matthew Sakai <msakai@xxxxxxxxxx>
---
drivers/md/dm-vdo/chapter-index.c | 2 +-
drivers/md/dm-vdo/config.h | 2 +-
drivers/md/dm-vdo/data-vio.h | 2 +-
drivers/md/dm-vdo/dedupe.c | 2 +-
drivers/md/dm-vdo/dedupe.h | 2 +-
drivers/md/dm-vdo/delta-index.c | 2 +-
drivers/md/dm-vdo/encodings.h | 2 +-
drivers/md/dm-vdo/funnel-queue.c | 1 -
drivers/md/dm-vdo/funnel-requestqueue.h | 2 +-
drivers/md/dm-vdo/geometry.c | 2 +-
drivers/md/dm-vdo/geometry.h | 2 +-
drivers/md/dm-vdo/hash-utils.h | 2 +-
drivers/md/dm-vdo/index-layout.h | 2 +-
drivers/md/dm-vdo/index-page-map.c | 2 +-
drivers/md/dm-vdo/index-session.h | 2 +-
drivers/md/dm-vdo/{uds.h => indexer.h} | 6 +++---
drivers/md/dm-vdo/sparse-cache.h | 2 +-
drivers/md/dm-vdo/uds-sysfs.c | 2 +-
drivers/md/dm-vdo/vdo.h | 2 +-
drivers/md/dm-vdo/volume-index.c | 2 +-
drivers/md/dm-vdo/volume-index.h | 2 +-
drivers/md/dm-vdo/volume.h | 2 +-
22 files changed, 23 insertions(+), 24 deletions(-)
rename drivers/md/dm-vdo/{uds.h => indexer.h} (99%)
diff --git a/drivers/md/dm-vdo/chapter-index.c b/drivers/md/dm-vdo/chapter-index.c
index 363991d56218..9b9185c2c237 100644
--- a/drivers/md/dm-vdo/chapter-index.c
+++ b/drivers/md/dm-vdo/chapter-index.c
@@ -7,10 +7,10 @@
#include "errors.h"
#include "hash-utils.h"
+#include "indexer.h"
#include "logger.h"
#include "memory-alloc.h"
#include "permassert.h"
-#include "uds.h"
int uds_make_open_chapter_index(struct open_chapter_index **chapter_index,
const struct index_geometry *geometry, u64 volume_nonce)
diff --git a/drivers/md/dm-vdo/config.h b/drivers/md/dm-vdo/config.h
index 7d19863800d6..08507dc2f7a1 100644
--- a/drivers/md/dm-vdo/config.h
+++ b/drivers/md/dm-vdo/config.h
@@ -7,8 +7,8 @@
#define UDS_CONFIG_H
#include "geometry.h"
+#include "indexer.h"
#include "io-factory.h"
-#include "uds.h"
/*
* The uds_configuration records a variety of parameters used to configure a new UDS index. Some
diff --git a/drivers/md/dm-vdo/data-vio.h b/drivers/md/dm-vdo/data-vio.h
index 78744d064e96..e7729623a6bb 100644
--- a/drivers/md/dm-vdo/data-vio.h
+++ b/drivers/md/dm-vdo/data-vio.h
@@ -10,8 +10,8 @@
#include <linux/bio.h>
#include <linux/list.h>
+#include "indexer.h"
#include "permassert.h"
-#include "uds.h"
#include "block-map.h"
#include "completion.h"
diff --git a/drivers/md/dm-vdo/dedupe.c b/drivers/md/dm-vdo/dedupe.c
index 2a1902c4423c..942a50ef8b0d 100644
--- a/drivers/md/dm-vdo/dedupe.c
+++ b/drivers/md/dm-vdo/dedupe.c
@@ -126,12 +126,12 @@
#include <linux/spinlock.h>
#include <linux/timer.h>
+#include "indexer.h"
#include "logger.h"
#include "memory-alloc.h"
#include "numeric.h"
#include "permassert.h"
#include "string-utils.h"
-#include "uds.h"
#include "action-manager.h"
#include "admin-state.h"
diff --git a/drivers/md/dm-vdo/dedupe.h b/drivers/md/dm-vdo/dedupe.h
index 773dde5f9365..1566fc972ea7 100644
--- a/drivers/md/dm-vdo/dedupe.h
+++ b/drivers/md/dm-vdo/dedupe.h
@@ -9,7 +9,7 @@
#include <linux/list.h>
#include <linux/timer.h>
-#include "uds.h"
+#include "indexer.h"
#include "admin-state.h"
#include "constants.h"
diff --git a/drivers/md/dm-vdo/delta-index.c b/drivers/md/dm-vdo/delta-index.c
index 6306777bb202..66f51b5f8fd2 100644
--- a/drivers/md/dm-vdo/delta-index.c
+++ b/drivers/md/dm-vdo/delta-index.c
@@ -13,13 +13,13 @@
#include "config.h"
#include "cpu.h"
#include "errors.h"
+#include "indexer.h"
#include "logger.h"
#include "memory-alloc.h"
#include "numeric.h"
#include "permassert.h"
#include "string-utils.h"
#include "time-utils.h"
-#include "uds.h"
/*
* The entries in a delta index could be stored in a single delta list, but to reduce search times
diff --git a/drivers/md/dm-vdo/encodings.h b/drivers/md/dm-vdo/encodings.h
index ba3db9867f4a..18794fd59b0b 100644
--- a/drivers/md/dm-vdo/encodings.h
+++ b/drivers/md/dm-vdo/encodings.h
@@ -11,8 +11,8 @@
#include <linux/limits.h>
#include <linux/uuid.h>
+#include "indexer.h"
#include "numeric.h"
-#include "uds.h"
#include "constants.h"
#include "types.h"
diff --git a/drivers/md/dm-vdo/funnel-queue.c b/drivers/md/dm-vdo/funnel-queue.c
index 6940b282086d..d5d96bb38b94 100644
--- a/drivers/md/dm-vdo/funnel-queue.c
+++ b/drivers/md/dm-vdo/funnel-queue.c
@@ -8,7 +8,6 @@
#include "cpu.h"
#include "memory-alloc.h"
#include "permassert.h"
-#include "uds.h"
int uds_make_funnel_queue(struct funnel_queue **queue_ptr)
{
diff --git a/drivers/md/dm-vdo/funnel-requestqueue.h b/drivers/md/dm-vdo/funnel-requestqueue.h
index e74c231fe269..9b0f53939b4d 100644
--- a/drivers/md/dm-vdo/funnel-requestqueue.h
+++ b/drivers/md/dm-vdo/funnel-requestqueue.h
@@ -6,7 +6,7 @@
#ifndef UDS_REQUEST_QUEUE_H
#define UDS_REQUEST_QUEUE_H
-#include "uds.h"
+#include "indexer.h"
/*
* A simple request queue which will handle new requests in the order in which they are received,
diff --git a/drivers/md/dm-vdo/geometry.c b/drivers/md/dm-vdo/geometry.c
index 0e83bba4184a..04c07195a01c 100644
--- a/drivers/md/dm-vdo/geometry.c
+++ b/drivers/md/dm-vdo/geometry.c
@@ -10,10 +10,10 @@
#include "delta-index.h"
#include "errors.h"
+#include "indexer.h"
#include "logger.h"
#include "memory-alloc.h"
#include "permassert.h"
-#include "uds.h"
/*
* An index volume is divided into a fixed number of fixed-size chapters, each consisting of a
diff --git a/drivers/md/dm-vdo/geometry.h b/drivers/md/dm-vdo/geometry.h
index 9a4a66ac2e46..a2ecdb238cf2 100644
--- a/drivers/md/dm-vdo/geometry.h
+++ b/drivers/md/dm-vdo/geometry.h
@@ -6,7 +6,7 @@
#ifndef UDS_INDEX_GEOMETRY_H
#define UDS_INDEX_GEOMETRY_H
-#include "uds.h"
+#include "indexer.h"
/*
* The index_geometry records parameters that define the layout of a UDS index volume, and the size and
diff --git a/drivers/md/dm-vdo/hash-utils.h b/drivers/md/dm-vdo/hash-utils.h
index e22be69695be..e3b865bbe9b2 100644
--- a/drivers/md/dm-vdo/hash-utils.h
+++ b/drivers/md/dm-vdo/hash-utils.h
@@ -7,8 +7,8 @@
#define UDS_HASH_UTILS_H
#include "geometry.h"
+#include "indexer.h"
#include "numeric.h"
-#include "uds.h"
/* Utilities for extracting portions of a request name for various uses. */
diff --git a/drivers/md/dm-vdo/index-layout.h b/drivers/md/dm-vdo/index-layout.h
index 84a9eb43a49d..e9ac6f4302d6 100644
--- a/drivers/md/dm-vdo/index-layout.h
+++ b/drivers/md/dm-vdo/index-layout.h
@@ -7,8 +7,8 @@
#define UDS_INDEX_LAYOUT_H
#include "config.h"
+#include "indexer.h"
#include "io-factory.h"
-#include "uds.h"
/*
* The index layout describes the format of the index on the underlying storage, and is responsible
diff --git a/drivers/md/dm-vdo/index-page-map.c b/drivers/md/dm-vdo/index-page-map.c
index 8441f86ef3a4..1bb12066ad1a 100644
--- a/drivers/md/dm-vdo/index-page-map.c
+++ b/drivers/md/dm-vdo/index-page-map.c
@@ -7,13 +7,13 @@
#include "errors.h"
#include "hash-utils.h"
+#include "indexer.h"
#include "logger.h"
#include "memory-alloc.h"
#include "numeric.h"
#include "permassert.h"
#include "string-utils.h"
#include "thread-utils.h"
-#include "uds.h"
/*
* The index page map is conceptually a two-dimensional array indexed by chapter number and index
diff --git a/drivers/md/dm-vdo/index-session.h b/drivers/md/dm-vdo/index-session.h
index 62a9020dd9fa..733d10f8a56c 100644
--- a/drivers/md/dm-vdo/index-session.h
+++ b/drivers/md/dm-vdo/index-session.h
@@ -10,8 +10,8 @@
#include <linux/cache.h>
#include "config.h"
+#include "indexer.h"
#include "thread-utils.h"
-#include "uds.h"
/*
* The index session mediates all interactions with a UDS index. Once the index session is created,
diff --git a/drivers/md/dm-vdo/uds.h b/drivers/md/dm-vdo/indexer.h
similarity index 99%
rename from drivers/md/dm-vdo/uds.h
rename to drivers/md/dm-vdo/indexer.h
index 1264362f8372..59e6a5ca2acb 100644
--- a/drivers/md/dm-vdo/uds.h
+++ b/drivers/md/dm-vdo/indexer.h
@@ -3,8 +3,8 @@
* Copyright 2023 Red Hat
*/
-#ifndef UDS_H
-#define UDS_H
+#ifndef INDEXER_H
+#define INDEXER_H
#include <linux/types.h>
@@ -326,4 +326,4 @@ int __must_check uds_get_index_session_stats(struct uds_index_session *session,
/* This function will fail if any required field of the request is not set. */
int __must_check uds_launch_request(struct uds_request *request);
-#endif /* UDS_H */
+#endif /* INDEXER_H */
diff --git a/drivers/md/dm-vdo/sparse-cache.h b/drivers/md/dm-vdo/sparse-cache.h
index 90b0be155453..45e2dcf165b5 100644
--- a/drivers/md/dm-vdo/sparse-cache.h
+++ b/drivers/md/dm-vdo/sparse-cache.h
@@ -7,7 +7,7 @@
#define UDS_SPARSE_CACHE_H
#include "geometry.h"
-#include "uds.h"
+#include "indexer.h"
/*
* The sparse cache is a cache of entire chapter indexes from sparse chapters used for searching
diff --git a/drivers/md/dm-vdo/uds-sysfs.c b/drivers/md/dm-vdo/uds-sysfs.c
index eee8a5b7d147..1548092e7de1 100644
--- a/drivers/md/dm-vdo/uds-sysfs.c
+++ b/drivers/md/dm-vdo/uds-sysfs.c
@@ -9,10 +9,10 @@
#include <linux/module.h>
#include <linux/slab.h>
+#include "indexer.h"
#include "logger.h"
#include "memory-alloc.h"
#include "string-utils.h"
-#include "uds.h"
#define UDS_SYSFS_NAME "uds"
diff --git a/drivers/md/dm-vdo/vdo.h b/drivers/md/dm-vdo/vdo.h
index 772317e6db52..3938e519ae6a 100644
--- a/drivers/md/dm-vdo/vdo.h
+++ b/drivers/md/dm-vdo/vdo.h
@@ -17,12 +17,12 @@
#include "admin-state.h"
#include "encodings.h"
#include "funnel-workqueue.h"
+#include "indexer.h"
#include "packer.h"
#include "physical-zone.h"
#include "statistics.h"
#include "thread-registry.h"
#include "types.h"
-#include "uds.h"
enum notifier_state {
/* Notifications are allowed but not in progress */
diff --git a/drivers/md/dm-vdo/volume-index.c b/drivers/md/dm-vdo/volume-index.c
index daeafe7691ea..39c4be06780f 100644
--- a/drivers/md/dm-vdo/volume-index.c
+++ b/drivers/md/dm-vdo/volume-index.c
@@ -14,12 +14,12 @@
#include "errors.h"
#include "geometry.h"
#include "hash-utils.h"
+#include "indexer.h"
#include "logger.h"
#include "memory-alloc.h"
#include "numeric.h"
#include "permassert.h"
#include "thread-utils.h"
-#include "uds.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 2eb2cee7ee58..66bf14fddc90 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 "indexer.h"
#include "thread-utils.h"
-#include "uds.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.h b/drivers/md/dm-vdo/volume.h
index 7ef9945d8403..290de5cbf9ec 100644
--- a/drivers/md/dm-vdo/volume.h
+++ b/drivers/md/dm-vdo/volume.h
@@ -14,13 +14,13 @@
#include "chapter-index.h"
#include "config.h"
#include "geometry.h"
+#include "indexer.h"
#include "index-layout.h"
#include "index-page-map.h"
#include "permassert.h"
#include "radix-sort.h"
#include "sparse-cache.h"
#include "thread-utils.h"
-#include "uds.h"
/*
* The volume manages deduplication records on permanent storage. The term "volume" can also refer
--
2.42.0
