From: Mike Snitzer <snitzer@xxxxxxxxxx>
Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
Signed-off-by: Chung Chung <cchung@xxxxxxxxxx>
Signed-off-by: Matthew Sakai <msakai@xxxxxxxxxx>
---
drivers/md/dm-vdo/dm-vdo-target.c | 2 +-
drivers/md/dm-vdo/errors.c | 16 ++++++++--------
drivers/md/dm-vdo/logical-zone.c | 2 +-
drivers/md/dm-vdo/slab-depot.c | 6 +++---
drivers/md/dm-vdo/string-utils.c | 2 +-
drivers/md/dm-vdo/string-utils.h | 10 +++++-----
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/md/dm-vdo/dm-vdo-target.c b/drivers/md/dm-vdo/dm-vdo-target.c
index 4908996f5224..b7b3eec39522 100644
--- a/drivers/md/dm-vdo/dm-vdo-target.c
+++ b/drivers/md/dm-vdo/dm-vdo-target.c
@@ -340,7 +340,7 @@ static int join_strings(char **substring_array, size_t array_length, char separa
current_position = &output[0];
for (i = 0; (i < array_length) && (substring_array[i] != NULL); i++) {
- current_position = uds_append_to_buffer(current_position,
+ current_position = vdo_append_to_buffer(current_position,
output + string_length, "%s",
substring_array[i]);
*current_position = separator;
diff --git a/drivers/md/dm-vdo/errors.c b/drivers/md/dm-vdo/errors.c
index 8b2d22381274..6f89eb1c63a3 100644
--- a/drivers/md/dm-vdo/errors.c
+++ b/drivers/md/dm-vdo/errors.c
@@ -154,19 +154,19 @@ const char *uds_string_error(int errnum, char *buf, size_t buflen)
block_name = get_error_info(errnum, &info);
if (block_name != NULL) {
if (info != NULL) {
- buffer = uds_append_to_buffer(buffer, buf_end, "%s: %s",
+ buffer = vdo_append_to_buffer(buffer, buf_end, "%s: %s",
block_name, info->message);
} else {
- buffer = uds_append_to_buffer(buffer, buf_end, "Unknown %s %d",
+ buffer = vdo_append_to_buffer(buffer, buf_end, "Unknown %s %d",
block_name, errnum);
}
} else if (info != NULL) {
- buffer = uds_append_to_buffer(buffer, buf_end, "%s", info->message);
+ buffer = vdo_append_to_buffer(buffer, buf_end, "%s", info->message);
} else {
const char *tmp = system_string_error(errnum, buffer, buf_end - buffer);
if (tmp != buffer)
- buffer = uds_append_to_buffer(buffer, buf_end, "%s", tmp);
+ buffer = vdo_append_to_buffer(buffer, buf_end, "%s", tmp);
else
buffer += strlen(tmp);
}
@@ -188,19 +188,19 @@ const char *uds_string_error_name(int errnum, char *buf, size_t buflen)
block_name = get_error_info(errnum, &info);
if (block_name != NULL) {
if (info != NULL) {
- buffer = uds_append_to_buffer(buffer, buf_end, "%s", info->name);
+ buffer = vdo_append_to_buffer(buffer, buf_end, "%s", info->name);
} else {
- buffer = uds_append_to_buffer(buffer, buf_end, "%s %d",
+ buffer = vdo_append_to_buffer(buffer, buf_end, "%s %d",
block_name, errnum);
}
} else if (info != NULL) {
- buffer = uds_append_to_buffer(buffer, buf_end, "%s", info->name);
+ buffer = vdo_append_to_buffer(buffer, buf_end, "%s", info->name);
} else {
const char *tmp;
tmp = system_string_error(errnum, buffer, buf_end - buffer);
if (tmp != buffer)
- buffer = uds_append_to_buffer(buffer, buf_end, "%s", tmp);
+ buffer = vdo_append_to_buffer(buffer, buf_end, "%s", tmp);
else
buffer += strlen(tmp);
}
diff --git a/drivers/md/dm-vdo/logical-zone.c b/drivers/md/dm-vdo/logical-zone.c
index 258bc55e419b..026f031ffc9e 100644
--- a/drivers/md/dm-vdo/logical-zone.c
+++ b/drivers/md/dm-vdo/logical-zone.c
@@ -368,6 +368,6 @@ void vdo_dump_logical_zone(const struct logical_zone *zone)
(unsigned long long) READ_ONCE(zone->flush_generation),
(unsigned long long) READ_ONCE(zone->oldest_active_generation),
(unsigned long long) READ_ONCE(zone->notification_generation),
- uds_bool_to_string(READ_ONCE(zone->notifying)),
+ vdo_bool_to_string(READ_ONCE(zone->notifying)),
(unsigned long long) READ_ONCE(zone->ios_in_flush_generation));
}
diff --git a/drivers/md/dm-vdo/slab-depot.c b/drivers/md/dm-vdo/slab-depot.c
index dc9f3d3c3995..46e4721e5b4f 100644
--- a/drivers/md/dm-vdo/slab-depot.c
+++ b/drivers/md/dm-vdo/slab-depot.c
@@ -3597,8 +3597,8 @@ void vdo_dump_block_allocator(const struct block_allocator *allocator)
vdo_log_info(" slab journal: entry_waiters=%zu waiting_to_commit=%s updating_slab_summary=%s head=%llu unreapable=%llu tail=%llu next_commit=%llu summarized=%llu last_summarized=%llu recovery_lock=%llu dirty=%s",
vdo_waitq_num_waiters(&journal->entry_waiters),
- uds_bool_to_string(journal->waiting_to_commit),
- uds_bool_to_string(journal->updating_slab_summary),
+ vdo_bool_to_string(journal->waiting_to_commit),
+ vdo_bool_to_string(journal->updating_slab_summary),
(unsigned long long) journal->head,
(unsigned long long) journal->unreapable,
(unsigned long long) journal->tail,
@@ -3606,7 +3606,7 @@ void vdo_dump_block_allocator(const struct block_allocator *allocator)
(unsigned long long) journal->summarized,
(unsigned long long) journal->last_summarized,
(unsigned long long) journal->recovery_lock,
- uds_bool_to_string(journal->recovery_lock != 0));
+ vdo_bool_to_string(journal->recovery_lock != 0));
/*
* Given the frequency with which the locks are just a tiny bit off, it might be
* worth dumping all the locks, but that might be too much logging.
diff --git a/drivers/md/dm-vdo/string-utils.c b/drivers/md/dm-vdo/string-utils.c
index 6cdf018cdaf0..71e44b4683ea 100644
--- a/drivers/md/dm-vdo/string-utils.c
+++ b/drivers/md/dm-vdo/string-utils.c
@@ -5,7 +5,7 @@
#include "string-utils.h"
-char *uds_append_to_buffer(char *buffer, char *buf_end, const char *fmt, ...)
+char *vdo_append_to_buffer(char *buffer, char *buf_end, const char *fmt, ...)
{
va_list args;
size_t n;
diff --git a/drivers/md/dm-vdo/string-utils.h b/drivers/md/dm-vdo/string-utils.h
index 8275af582cf7..96eecd38b1c2 100644
--- a/drivers/md/dm-vdo/string-utils.h
+++ b/drivers/md/dm-vdo/string-utils.h
@@ -3,21 +3,21 @@
* Copyright 2023 Red Hat
*/
-#ifndef UDS_STRING_UTILS_H
-#define UDS_STRING_UTILS_H
+#ifndef VDO_STRING_UTILS_H
+#define VDO_STRING_UTILS_H
#include <linux/kernel.h>
#include <linux/string.h>
/* Utilities related to string manipulation */
-static inline const char *uds_bool_to_string(bool value)
+static inline const char *vdo_bool_to_string(bool value)
{
return value ? "true" : "false";
}
/* Append a formatted string to the end of a buffer. */
-char *uds_append_to_buffer(char *buffer, char *buf_end, const char *fmt, ...)
+char *vdo_append_to_buffer(char *buffer, char *buf_end, const char *fmt, ...)
__printf(3, 4);
-#endif /* UDS_STRING_UTILS_H */
+#endif /* VDO_STRING_UTILS_H */
--
2.42.0
