Commit bbde07a4 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: push printk index code into their respective helpers 



The printk index work can be pushed into the printk helpers themselves,
this allows us to further sanitize messages.h, removing the last
include in the header itself.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 9b569ea0

fs/btrfs/messages.h

+1 −28
Original line number Diff line number Diff line
@@ -13,19 +13,7 @@ void btrfs_no_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...) 
{

}



#ifdef CONFIG_PRINTK_INDEX



#define btrfs_printk(fs_info, fmt, args...)					\

do {										\

	printk_index_subsys_emit("%sBTRFS %s (device %s): ", NULL, fmt);	\

	_btrfs_printk(fs_info, fmt, ##args);					\

} while (0)



__printf(2, 3)

__cold

void _btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...);



#elif defined(CONFIG_PRINTK)

#ifdef CONFIG_PRINTK



#define btrfs_printk(fs_info, fmt, args...)				\

	_btrfs_printk(fs_info, fmt, ##args)
@@ -223,25 +211,10 @@ do { \ 
				  __LINE__, (errno), first);	\

} while (0)



#ifdef CONFIG_PRINTK_INDEX



#define btrfs_handle_fs_error(fs_info, errno, fmt, args...)		\

do {									\

	printk_index_subsys_emit(					\

		"BTRFS: error (device %s%s) in %s:%d: errno=%d %s",	\

		KERN_CRIT, fmt);					\

	__btrfs_handle_fs_error((fs_info), __func__, __LINE__,		\

				(errno), fmt, ##args);			\

} while (0)



#else



#define btrfs_handle_fs_error(fs_info, errno, fmt, args...)		\

	__btrfs_handle_fs_error((fs_info), __func__, __LINE__,		\

				(errno), fmt, ##args)



#endif



__printf(5, 6)

__cold

void __btrfs_panic(struct btrfs_fs_info *fs_info, const char *function,

fs/btrfs/super.c

+10 −0
Original line number Diff line number Diff line
@@ -181,6 +181,12 @@ void __btrfs_handle_fs_error(struct btrfs_fs_info *fs_info, const char *function 
	const char *errstr;

#endif



#ifdef CONFIG_PRINTK_INDEX

	printk_index_subsys_emit(

		"BTRFS: error (device %s%s) in %s:%d: errno=%d %s",

		KERN_CRIT, fmt);

#endif



	/*

	 * Special case: if the error is EROFS, and we're already

	 * under SB_RDONLY, then it is safe here.
@@ -273,6 +279,10 @@ void __cold _btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, 
	const char *type = logtypes[4];

	struct ratelimit_state *ratelimit = &printk_limits[4];



#ifdef CONFIG_PRINTK_INDEX

	printk_index_subsys_emit("%sBTRFS %s (device %s): ", NULL, fmt);

#endif



	va_start(args, fmt);



	while ((kern_level = printk_get_level(fmt)) != 0) {