diff options
| author | Wang Shilong <wangsl.fnst@cn.fujitsu.com> | 2014-01-14 19:42:20 +0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-01-28 13:20:36 -0800 |
| commit | 2c21b4d733d6e50514e30ffd87110364ddda695b (patch) | |
| tree | 95b303ca51649e3a934a6296042ada3d1dbea687 /fs/btrfs | |
| parent | e4355f34ef9fc75a93875fd075137ef2ea378883 (diff) | |
| download | linux-stable-2c21b4d733d6e50514e30ffd87110364ddda695b.tar.gz linux-stable-2c21b4d733d6e50514e30ffd87110364ddda695b.tar.bz2 linux-stable-2c21b4d733d6e50514e30ffd87110364ddda695b.zip | |
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>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 1ea19cea96d0..7b61ea3141e5 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -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); |