From: Mike Snitzer <snitzer@xxxxxxxxxx>
Addresses various sparse warnings like:
warning: symbol 'SYMBOL' was not declared. Should it be static?
Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
Signed-off-by: Susan LeGendre-McGhee <slegendr@xxxxxxxxxx>
Signed-off-by: Matthew Sakai <msakai@xxxxxxxxxx>
---
drivers/md/dm-vdo/Makefile | 1 -
drivers/md/dm-vdo/block-map.c | 2 +-
drivers/md/dm-vdo/constants.c | 15 ---------------
drivers/md/dm-vdo/constants.h | 6 +++---
drivers/md/dm-vdo/encodings.c | 2 +-
5 files changed, 5 insertions(+), 21 deletions(-)
delete mode 100644 drivers/md/dm-vdo/constants.c
diff --git a/drivers/md/dm-vdo/Makefile b/drivers/md/dm-vdo/Makefile
index 8f8d161a6dbe..8c06c3b969e3 100644
--- a/drivers/md/dm-vdo/Makefile
+++ b/drivers/md/dm-vdo/Makefile
@@ -9,7 +9,6 @@ dm-vdo-objs := \
chapter-index.o \
completion.o \
config.o \
- constants.o \
data-vio.o \
dedupe.o \
delta-index.o \
diff --git a/drivers/md/dm-vdo/block-map.c b/drivers/md/dm-vdo/block-map.c
index 54ad6939cab7..1278a5791160 100644
--- a/drivers/md/dm-vdo/block-map.c
+++ b/drivers/md/dm-vdo/block-map.c
@@ -67,7 +67,7 @@ struct block_map_tree_segment {
struct block_map_tree {
struct block_map_tree_segment *segments;
-} block_map_tree;
+};
struct forest {
struct block_map *map;
diff --git a/drivers/md/dm-vdo/constants.c b/drivers/md/dm-vdo/constants.c
deleted file mode 100644
index 14ac047101f8..000000000000
--- a/drivers/md/dm-vdo/constants.c
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright 2023 Red Hat
- */
-
-#include "types.h"
-
-/* The maximum logical space is 4 petabytes, which is 1 terablock. */
-const block_count_t MAXIMUM_VDO_LOGICAL_BLOCKS = 1024ULL * 1024 * 1024 * 1024;
-
-/* The maximum physical space is 256 terabytes, which is 64 gigablocks. */
-const block_count_t MAXIMUM_VDO_PHYSICAL_BLOCKS = 1024ULL * 1024 * 1024 * 64;
-
-/* unit test minimum */
-const block_count_t MINIMUM_VDO_SLAB_JOURNAL_BLOCKS = 2;
diff --git a/drivers/md/dm-vdo/constants.h b/drivers/md/dm-vdo/constants.h
index 9ae3917d00de..3a997dd7d0b1 100644
--- a/drivers/md/dm-vdo/constants.h
+++ b/drivers/md/dm-vdo/constants.h
@@ -91,12 +91,12 @@ enum {
};
/** The maximum logical space is 4 petabytes, which is 1 terablock. */
-extern const block_count_t MAXIMUM_VDO_LOGICAL_BLOCKS;
+static const block_count_t MAXIMUM_VDO_LOGICAL_BLOCKS = 1024ULL * 1024 * 1024 * 1024;
/** The maximum physical space is 256 terabytes, which is 64 gigablocks. */
-extern const block_count_t MAXIMUM_VDO_PHYSICAL_BLOCKS;
+static const block_count_t MAXIMUM_VDO_PHYSICAL_BLOCKS = 1024ULL * 1024 * 1024 * 64;
/** unit test minimum */
-extern const block_count_t MINIMUM_VDO_SLAB_JOURNAL_BLOCKS;
+static const block_count_t MINIMUM_VDO_SLAB_JOURNAL_BLOCKS = 2;
#endif /* VDO_CONSTANTS_H */
diff --git a/drivers/md/dm-vdo/encodings.c b/drivers/md/dm-vdo/encodings.c
index 2d9d8645f66b..6b3e9a5b3a91 100644
--- a/drivers/md/dm-vdo/encodings.c
+++ b/drivers/md/dm-vdo/encodings.c
@@ -85,7 +85,7 @@ const struct header VDO_SLAB_DEPOT_HEADER_2_0 = {
.size = sizeof(struct slab_depot_state_2_0),
};
-const struct header VDO_LAYOUT_HEADER_3_0 = {
+static const struct header VDO_LAYOUT_HEADER_3_0 = {
.id = VDO_LAYOUT,
.version = {
.major_version = 3,
--
2.42.0
