Commit ed164802 authored by David Sterba's avatar David Sterba
Browse files

btrfs: rename errno identifiers to error 



We sync the kernel files to userspace and the 'errno' symbol is defined
by standard library, which does not matter in kernel but the parameters
or local variables could clash. Rename them all.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 28270e25

fs/btrfs/backref.h

+2 −2
Original line number Diff line number Diff line
@@ -533,9 +533,9 @@ void btrfs_backref_cleanup_node(struct btrfs_backref_cache *cache, 
void btrfs_backref_release_cache(struct btrfs_backref_cache *cache);



static inline void btrfs_backref_panic(struct btrfs_fs_info *fs_info,

				       u64 bytenr, int errno)

				       u64 bytenr, int error)

{

	btrfs_panic(fs_info, errno,

	btrfs_panic(fs_info, error,

		    "Inconsistency in backref cache found at offset %llu",

		    bytenr);

}

fs/btrfs/compression.c

+3 −3
Original line number Diff line number Diff line
@@ -193,12 +193,12 @@ static noinline void end_compressed_writeback(const struct compressed_bio *cb) 
	unsigned long index = cb->start >> PAGE_SHIFT;

	unsigned long end_index = (cb->start + cb->len - 1) >> PAGE_SHIFT;

	struct folio_batch fbatch;

	const int errno = blk_status_to_errno(cb->bbio.bio.bi_status);

	const int error = blk_status_to_errno(cb->bbio.bio.bi_status);

	int i;

	int ret;



	if (errno)

		mapping_set_error(inode->i_mapping, errno);

	if (error)

		mapping_set_error(inode->i_mapping, error);



	folio_batch_init(&fbatch);

	while (index <= end_index) {

fs/btrfs/ctree.c

+2 −2
Original line number Diff line number Diff line
@@ -230,9 +230,9 @@ noinline void btrfs_release_path(struct btrfs_path *p) 
 * cause could be a bug, eg. due to ENOSPC, and not for common errors that are

 * caused by external factors.

 */

bool __cold abort_should_print_stack(int errno)

bool __cold abort_should_print_stack(int error)

{

	switch (errno) {

	switch (error) {

	case -EIO:

	case -EROFS:

	case -ENOMEM:

fs/btrfs/messages.c

+12 −12
Original line number Diff line number Diff line
@@ -72,11 +72,11 @@ static void btrfs_state_to_string(const struct btrfs_fs_info *info, char *buf) 
 *        over the error.  Each subsequent error that doesn't have any context

 *        of the original error should use EROFS when handling BTRFS_FS_STATE_ERROR.

 */

const char * __attribute_const__ btrfs_decode_error(int errno)

const char * __attribute_const__ btrfs_decode_error(int error)

{

	char *errstr = "unknown";



	switch (errno) {

	switch (error) {

	case -ENOENT:		/* -2 */

		errstr = "No such entry";

		break;
@@ -115,7 +115,7 @@ const char * __attribute_const__ btrfs_decode_error(int errno) 
 */

__cold

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

		       unsigned int line, int errno, const char *fmt, ...)

		       unsigned int line, int error, const char *fmt, ...)

{

	struct super_block *sb = fs_info->sb;

#ifdef CONFIG_PRINTK
@@ -132,11 +132,11 @@ void __btrfs_handle_fs_error(struct btrfs_fs_info *fs_info, const char *function 
	 * Special case: if the error is EROFS, and we're already under

	 * SB_RDONLY, then it is safe here.

	 */

	if (errno == -EROFS && sb_rdonly(sb))

	if (error == -EROFS && sb_rdonly(sb))

		return;



#ifdef CONFIG_PRINTK

	errstr = btrfs_decode_error(errno);

	errstr = btrfs_decode_error(error);

	btrfs_state_to_string(fs_info, statestr);

	if (fmt) {

		struct va_format vaf;
@@ -147,11 +147,11 @@ void __btrfs_handle_fs_error(struct btrfs_fs_info *fs_info, const char *function 
		vaf.va = &args;



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

			sb->s_id, statestr, function, line, errno, errstr, &vaf);

			sb->s_id, statestr, function, line, error, errstr, &vaf);

		va_end(args);

	} else {

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

			sb->s_id, statestr, function, line, errno, errstr);

			sb->s_id, statestr, function, line, error, errstr);

	}

#endif
@@ -159,7 +159,7 @@ void __btrfs_handle_fs_error(struct btrfs_fs_info *fs_info, const char *function 
	 * Today we only save the error info to memory.  Long term we'll also

	 * send it down to the disk.

	 */

	WRITE_ONCE(fs_info->fs_error, errno);

	WRITE_ONCE(fs_info->fs_error, error);



	/* Don't go through full error handling during mount. */

	if (!(sb->s_flags & SB_BORN))
@@ -288,7 +288,7 @@ void __cold btrfs_err_32bit_limit(struct btrfs_fs_info *fs_info) 
 */

__cold

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

		   unsigned int line, int errno, const char *fmt, ...)

		   unsigned int line, int error, const char *fmt, ...)

{

	char *s_id = "<unknown>";

	const char *errstr;
@@ -301,13 +301,13 @@ void __btrfs_panic(struct btrfs_fs_info *fs_info, const char *function, 
	va_start(args, fmt);

	vaf.va = &args;



	errstr = btrfs_decode_error(errno);

	errstr = btrfs_decode_error(error);

	if (fs_info && (btrfs_test_opt(fs_info, PANIC_ON_FATAL_ERROR)))

		panic(KERN_CRIT "BTRFS panic (device %s) in %s:%d: %pV (errno=%d %s)\n",

			s_id, function, line, &vaf, errno, errstr);

			s_id, function, line, &vaf, error, errstr);



	btrfs_crit(fs_info, "panic in %s:%d: %pV (errno=%d %s)",

		   function, line, &vaf, errno, errstr);

		   function, line, &vaf, error, errstr);

	va_end(args);

	/* Caller calls BUG() */

}

fs/btrfs/messages.h

+7 −7
Original line number Diff line number Diff line
@@ -184,25 +184,25 @@ do { \ 
__printf(5, 6)

__cold

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

		     unsigned int line, int errno, const char *fmt, ...);

		     unsigned int line, int error, const char *fmt, ...);



const char * __attribute_const__ btrfs_decode_error(int errno);

const char * __attribute_const__ btrfs_decode_error(int error);



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

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

	__btrfs_handle_fs_error((fs_info), __func__, __LINE__,		\

				(errno), fmt, ##args)

				(error), fmt, ##args)



__printf(5, 6)

__cold

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

		   unsigned int line, int errno, const char *fmt, ...);

		   unsigned int line, int error, const char *fmt, ...);

/*

 * If BTRFS_MOUNT_PANIC_ON_FATAL_ERROR is in mount_opt, __btrfs_panic

 * will panic().  Otherwise we BUG() here.

 */

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

#define btrfs_panic(fs_info, error, fmt, args...)			\

do {									\

	__btrfs_panic(fs_info, __func__, __LINE__, errno, fmt, ##args);	\

	__btrfs_panic(fs_info, __func__, __LINE__, error, fmt, ##args);	\

	BUG();								\

} while (0)