Commit 2c21b4d7 authored Jan 14, 2014 by Wang Shilong Committed by Chris Mason Jan 28, 2014

Btrfs: fix transaction abortion when remounting btrfs from RW to RO



Steps to reproduce:
 # mkfs.btrfs -f /dev/sda8
 # mount /dev/sda8 /mnt -o flushoncommit
 # dd if=/dev/zero of=/mnt/data bs=4k count=102400 &
 # mount /dev/sda8 /mnt -o remount, ro

When remounting RW to RO, the logic is to firstly set flag
to RO and then commit transaction, however with option
flushoncommit enabled,we will do RO check within committing
transaction, so we get a transaction abortion here.

Actually,here check is wrong, we should check if FS_STATE_ERROR
is set, fix it.

Reported-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Suggested-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Chris Mason <clm@fb.com>

parent e4355f34

fs/btrfs/inode.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -8477,7 +8477,7 @@ int btrfs_start_delalloc_inodes(struct btrfs_root *root, int delay_iput)
		{
		int ret;

		if (root->fs_info->sb->s_flags & MS_RDONLY)
		if (test_bit(BTRFS_FS_STATE_ERROR, &root->fs_info->fs_state))
		return -EROFS;

		ret = __start_delalloc_inodes(root, delay_iput);
		@@ -8503,7 +8503,7 @@ int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, int delay_iput)
		struct list_head splice;
		int ret;

		if (fs_info->sb->s_flags & MS_RDONLY)
		if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state))
		return -EROFS;

		INIT_LIST_HEAD(&splice);