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

Commit c5f4ccb2 authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: move error handling code together in ctree.h 



Looks like we added the incompatible defines in between the error
handling defines in the file ctree.h. Now group them back.

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 2351d743

fs/btrfs/ctree.h

+40 −38
Original line number Diff line number Diff line
@@ -4338,6 +4338,46 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans, 
			       struct btrfs_root *root, const char *function,

			       unsigned int line, int errno);



/*

 * Call btrfs_abort_transaction as early as possible when an error condition is

 * detected, that way the exact line number is reported.

 */

#define btrfs_abort_transaction(trans, root, errno)		\

do {								\

	/* Report first abort since mount */			\

	if (!test_and_set_bit(BTRFS_FS_STATE_TRANS_ABORTED,	\

			&((root)->fs_info->fs_state))) {	\

		WARN(1, KERN_DEBUG				\

		"BTRFS: Transaction aborted (error %d)\n",	\

		(errno));					\

	}							\

	__btrfs_abort_transaction((trans), (root), __func__,	\

				  __LINE__, (errno));		\

} while (0)



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

do {								\

	__btrfs_handle_fs_error((fs_info), __func__, __LINE__,	\

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

} while (0)



__printf(5, 6)

__cold

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

		   unsigned int line, int errno, 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...)			\

do {									\

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

	BUG();								\

} while (0)





/* compatibility and incompatibility defines */



#define btrfs_set_fs_incompat(__fs_info, opt) \

	__btrfs_set_fs_incompat((__fs_info), BTRFS_FEATURE_INCOMPAT_##opt)
@@ -4454,44 +4494,6 @@ static inline int __btrfs_fs_compat_ro(struct btrfs_fs_info *fs_info, u64 flag) 
	return !!(btrfs_super_compat_ro_flags(disk_super) & flag);

}



/*

 * Call btrfs_abort_transaction as early as possible when an error condition is

 * detected, that way the exact line number is reported.

 */

#define btrfs_abort_transaction(trans, root, errno)		\

do {								\

	/* Report first abort since mount */			\

	if (!test_and_set_bit(BTRFS_FS_STATE_TRANS_ABORTED,	\

			&((root)->fs_info->fs_state))) {	\

		WARN(1, KERN_DEBUG				\

		"BTRFS: Transaction aborted (error %d)\n",	\

		(errno));					\

	}							\

	__btrfs_abort_transaction((trans), (root), __func__,	\

				  __LINE__, (errno));		\

} while (0)



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

do {								\

	__btrfs_handle_fs_error((fs_info), __func__, __LINE__,	\

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

} while (0)



__printf(5, 6)

__cold

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

		   unsigned int line, int errno, 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...)			\

do {									\

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

	BUG();								\

} while (0)



/* acl.c */

#ifdef CONFIG_BTRFS_FS_POSIX_ACL

struct posix_acl *btrfs_get_acl(struct inode *inode, int type);