Commit ea90d270 authored by John Garry's avatar John Garry Committed by Song Liu
Browse files

md/raid5: Increase r5conf.cache_name size 



For compiling with W=1, the following warning can be seen:

drivers/md/raid5.c: In function ‘setup_conf’:
drivers/md/raid5.c:2423:12: error: ‘%s’ directive output may be truncated writing up to 31 bytes into a region of size between 16 and 26 [-Werror=format-truncation=]
    "raid%d-%s", conf->level, mdname(conf->mddev));
            ^~
drivers/md/raid5.c:2422:3: note: ‘snprintf’ output between 7 and 48 bytes into a destination of size 32
   snprintf(conf->cache_name[0], namelen,
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    "raid%d-%s", conf->level, mdname(conf->mddev));
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Increase the array size to avoid this warning.

Signed-off-by: default avatarJohn Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20241112161019.4154616-2-john.g.garry@oracle.com


Signed-off-by: default avatarSong Liu <song@kernel.org>
parent 0b4ace9d

drivers/md/raid5.h

+1 −1
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ struct r5conf { 
	 * two caches.

	 */

	int			active_name;

	char			cache_name[2][32];

	char			cache_name[2][48];

	struct kmem_cache	*slab_cache; /* for allocating stripes */

	struct mutex		cache_size_mutex; /* Protect changes to cache size */