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

btrfs: add a BTRFS_FS_ERROR helper 



We have a few flags that are inconsistently used to describe the fs in
different states of failure.  As of 5963ffca ("btrfs: always abort
the transaction if we abort a trans handle") we will always set
BTRFS_FS_STATE_ERROR if we abort, so we don't have to check both ABORTED
and ERROR to see if things have gone wrong.  Add a helper to check
BTRFS_FS_STATE_ERROR and then convert all checkers of FS_STATE_ERROR to
use the helper.

The TRANS_ABORTED bit check was added in af722733 ("Btrfs: clean up
resources during umount after trans is aborted") but is not actually
specific.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.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 9a35fc95

fs/btrfs/ctree.h

+3 −0
Original line number Diff line number Diff line
@@ -3607,6 +3607,9 @@ do { \ 
			  (errno), fmt, ##args);		\

} while (0)



#define BTRFS_FS_ERROR(fs_info)	(unlikely(test_bit(BTRFS_FS_STATE_ERROR, \

						   &(fs_info)->fs_state)))



__printf(5, 6)

__cold

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

fs/btrfs/disk-io.c

+3 −5
Original line number Diff line number Diff line
@@ -1954,8 +1954,7 @@ static int transaction_kthread(void *arg) 
		wake_up_process(fs_info->cleaner_kthread);

		mutex_unlock(&fs_info->transaction_kthread_mutex);



		if (unlikely(test_bit(BTRFS_FS_STATE_ERROR,

				      &fs_info->fs_state)))

		if (BTRFS_FS_ERROR(fs_info))

			btrfs_cleanup_transaction(fs_info);

		if (!kthread_should_stop() &&

				(!btrfs_transaction_blocked(fs_info) ||
@@ -4232,7 +4231,7 @@ void btrfs_drop_and_free_fs_root(struct btrfs_fs_info *fs_info, 
		drop_ref = true;

	spin_unlock(&fs_info->fs_roots_radix_lock);



	if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state)) {

	if (BTRFS_FS_ERROR(fs_info)) {

		ASSERT(root->log_root == NULL);

		if (root->reloc_root) {

			btrfs_put_root(root->reloc_root);
@@ -4383,8 +4382,7 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info) 
			btrfs_err(fs_info, "commit super ret %d", ret);

	}



	if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state) ||

	    test_bit(BTRFS_FS_STATE_TRANS_ABORTED, &fs_info->fs_state))

	if (BTRFS_FS_ERROR(fs_info))

		btrfs_error_commit_super(fs_info);



	kthread_stop(fs_info->transaction_kthread);

fs/btrfs/extent_io.c

+1 −1
Original line number Diff line number Diff line
@@ -4908,7 +4908,7 @@ int btree_write_cache_pages(struct address_space *mapping, 
	 *   extent io tree. Thus we don't want to submit such wild eb

	 *   if the fs already has error.

	 */

	if (!test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state)) {

	if (!BTRFS_FS_ERROR(fs_info)) {

		ret = flush_write_bio(&epd);

	} else {

		ret = -EROFS;

fs/btrfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -2018,7 +2018,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb, 
	 * have opened a file as writable, we have to stop this write operation

	 * to ensure consistency.

	 */

	if (test_bit(BTRFS_FS_STATE_ERROR, &inode->root->fs_info->fs_state))

	if (BTRFS_FS_ERROR(inode->root->fs_info))

		return -EROFS;



	if (!(iocb->ki_flags & IOCB_DIRECT) &&

fs/btrfs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -4380,7 +4380,7 @@ static void btrfs_prune_dentries(struct btrfs_root *root) 
	struct inode *inode;

	u64 objectid = 0;



	if (!test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state))

	if (!BTRFS_FS_ERROR(fs_info))

		WARN_ON(btrfs_root_refs(&root->root_item) != 0);



	spin_lock(&root->inode_lock);
@@ -9998,7 +9998,7 @@ int btrfs_start_delalloc_snapshot(struct btrfs_root *root, bool in_reclaim_conte 
	};

	struct btrfs_fs_info *fs_info = root->fs_info;



	if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state))

	if (BTRFS_FS_ERROR(fs_info))

		return -EROFS;



	return start_delalloc_inodes(root, &wbc, true, in_reclaim_context);
@@ -10017,7 +10017,7 @@ int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, long nr, 
	struct list_head splice;

	int ret;



	if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state))

	if (BTRFS_FS_ERROR(fs_info))

		return -EROFS;



	INIT_LIST_HEAD(&splice);