Commit 87533c47 authored by Miao Xie's avatar Miao Xie Committed by Josef Bacik
Browse files

Btrfs: use bit operation for ->fs_state 



There is no lock to protect fs_info->fs_state, it will introduce
some problems, such as the value may be covered by the other task
when several tasks modify it. For example:
	Task0 - CPU0		Task1 - CPU1
	mov %fs_state rax
	or $0x1 rax
				mov %fs_state rax
				or $0x2 rax
	mov rax %fs_state
				mov rax %fs_state
The expected value is 3, but in fact, it is 2.

Though this problem doesn't happen now (because there is only one
flag currently), the code is error prone, if we add other flags,
the above problem will happen to a certainty.

Now we use bit operation for it to fix the above problem.
In this way, we can make the code more robust and be easy to
add new flags.

Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent de98ced9

fs/btrfs/ctree.h

+3 −1
Original line number Diff line number Diff line
@@ -338,7 +338,9 @@ static inline unsigned long btrfs_chunk_item_size(int num_stripes) 
/*

 * File system states

 */

#define BTRFS_FS_STATE_ERROR		0



/* Super block flags */

/* Errors detected */

#define BTRFS_SUPER_FLAG_ERROR		(1ULL << 2)
@@ -1549,7 +1551,7 @@ struct btrfs_fs_info { 
	u64 qgroup_seq;



	/* filesystem state */

	u64 fs_state;

	unsigned long fs_state;



	struct btrfs_delayed_root *delayed_root;

fs/btrfs/disk-io.c

+3 −2
Original line number Diff line number Diff line
@@ -2201,7 +2201,8 @@ int open_ctree(struct super_block *sb, 
		goto fail_alloc;



	/* check FS state, whether FS is broken. */

	fs_info->fs_state |= btrfs_super_flags(disk_super);

	if (btrfs_super_flags(disk_super) & BTRFS_SUPER_FLAG_ERROR)

		set_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state);



	ret = btrfs_check_super_valid(fs_info, sb->s_flags & MS_RDONLY);

	if (ret) {
@@ -3359,7 +3360,7 @@ int close_ctree(struct btrfs_root *root) 
			printk(KERN_ERR "btrfs: commit super ret %d\n", ret);

	}



	if (fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR)

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

		btrfs_error_commit_super(root);



	btrfs_put_block_group_cache(fs_info);

fs/btrfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1545,7 +1545,7 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb, 
	 * although we have opened a file as writable, we have

	 * to stop this write operation to ensure FS consistency.

	 */

	if (root->fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR) {

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

		mutex_unlock(&inode->i_mutex);

		err = -EROFS;

		goto out;

fs/btrfs/scrub.c

+1 −1
Original line number Diff line number Diff line
@@ -2708,7 +2708,7 @@ static noinline_for_stack int scrub_supers(struct scrub_ctx *sctx, 
	int	ret;

	struct btrfs_root *root = sctx->dev_root;



	if (root->fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR)

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

		return -EIO;



	gen = root->fs_info->last_trans_committed;

fs/btrfs/super.c

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static void __save_error_info(struct btrfs_fs_info *fs_info) 
	 * today we only save the error info into ram.  Long term we'll

	 * also send it down to the disk

	 */

	fs_info->fs_state = BTRFS_SUPER_FLAG_ERROR;

	set_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state);

}



static void save_error_info(struct btrfs_fs_info *fs_info)
@@ -114,7 +114,7 @@ static void btrfs_handle_error(struct btrfs_fs_info *fs_info) 
	if (sb->s_flags & MS_RDONLY)

		return;



	if (fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR) {

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

		sb->s_flags |= MS_RDONLY;

		printk(KERN_INFO "btrfs is forced readonly\n");

		/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE