Skip to content

Commit

Permalink
dm vdo: use a short static string for thread name prefix
Browse files Browse the repository at this point in the history
Also remove MODULE_NAME, which is now unused.

This fixes a warning about string truncation in snprintf that
will never happen in practice:

drivers/md/dm-vdo/vdo.c: In function ‘vdo_make’:
drivers/md/dm-vdo/vdo.c:564:5: error: ‘%s’ directive output may be truncated writing up to 55 bytes into a region of size 16 [-Werror=format-truncation=]
    "%s%u", MODULE_NAME, instance);
     ^~
drivers/md/dm-vdo/vdo.c:563:2: note: ‘snprintf’ output between 2 and 66 bytes into a destination of size 16
  snprintf(vdo->thread_name_prefix, sizeof(vdo->thread_name_prefix),
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    "%s%u", MODULE_NAME, instance);
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Suggested-by: John Garry <[email protected]>
Signed-off-by: Matthew Sakai <[email protected]>
  • Loading branch information
lorelei-sakai committed Jan 14, 2025
1 parent 63a477e commit 6431992
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/md/dm-vdo/vdo.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,6 @@ static void finish_vdo_request_queue(void *ptr)
vdo_unregister_allocating_thread();
}

#ifdef MODULE
#define MODULE_NAME THIS_MODULE->name
#else
#define MODULE_NAME "dm-vdo"
#endif /* MODULE */

static const struct vdo_work_queue_type default_queue_type = {
.start = start_vdo_request_queue,
.finish = finish_vdo_request_queue,
Expand Down Expand Up @@ -559,7 +553,7 @@ int vdo_make(unsigned int instance, struct device_config *config, char **reason,
*vdo_ptr = vdo;

snprintf(vdo->thread_name_prefix, sizeof(vdo->thread_name_prefix),
"%s%u", MODULE_NAME, instance);
"%s%u", "vdo", instance);
BUG_ON(vdo->thread_name_prefix[0] == '\0');
result = vdo_allocate(vdo->thread_config.thread_count,
struct vdo_thread, __func__, &vdo->threads);
Expand Down

0 comments on commit 6431992

Please sign in to comment.