Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b8e5df6 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Chris Mason
Browse files

btrfs: fix static checker warnings 



This patch fixes the following warnings:
fs/btrfs/extent-tree.c:6201:12: sparse: symbol 'get_raid_name' was not declared. Should it be static?
fs/btrfs/extent-tree.c:8430:9: error: format not a string literal and no format arguments [-Werror=format-security] get_raid_name(index));

Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 131e404a

fs/btrfs/extent-tree.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -6195,7 +6195,7 @@ static const char *btrfs_raid_type_names[BTRFS_NR_RAID_TYPES] = { 
	[BTRFS_RAID_RAID6]	= "raid6",

	[BTRFS_RAID_RAID6]	= "raid6",

};

};





const char *get_raid_name(enum btrfs_raid_types type)

static const char *get_raid_name(enum btrfs_raid_types type)

{

{

	if (type >= BTRFS_NR_RAID_TYPES)

	if (type >= BTRFS_NR_RAID_TYPES)

		return NULL;

		return NULL;
@@ -8423,7 +8423,7 @@ static void __link_block_group(struct btrfs_space_info *space_info, 




		kobject_get(&space_info->kobj); /* put in release */

		kobject_get(&space_info->kobj); /* put in release */

		ret = kobject_init_and_add(kobj, &btrfs_raid_ktype,

		ret = kobject_init_and_add(kobj, &btrfs_raid_ktype,

					   &space_info->kobj,

					   &space_info->kobj, "%s",

					   get_raid_name(index));

					   get_raid_name(index));

		if (ret) {

		if (ret) {

			pr_warn("btrfs: failed to add kobject for block cache. ignoring.\n");

			pr_warn("btrfs: failed to add kobject for block cache. ignoring.\n");