From c389fc3ce1fa28c1df2f1419b782b0846e2f6f61 Mon Sep 17 00:00:00 2001 From: Emil Karlson Date: Thu, 8 Nov 2018 19:58:22 +0200 Subject: [PATCH 3/4] btrfs: do not accept any errors before remounting readonly --- fs/btrfs/volumes.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 00af07fd532d..749d69b8cc03 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5035,20 +5035,9 @@ static noinline int init_first_rw_device(struct btrfs_trans_handle *trans, static inline int btrfs_chunk_max_errors(struct map_lookup *map) { - int max_errors; - - if (map->type & (BTRFS_BLOCK_GROUP_RAID1 | - BTRFS_BLOCK_GROUP_RAID10 | - BTRFS_BLOCK_GROUP_RAID5 | - BTRFS_BLOCK_GROUP_DUP)) { - max_errors = 1; - } else if (map->type & BTRFS_BLOCK_GROUP_RAID6) { - max_errors = 2; - } else { - max_errors = 0; - } + (void)map; - return max_errors; + return 0; } int btrfs_chunk_readonly(struct btrfs_fs_info *fs_info, u64 chunk_offset) -- 2.20.0.rc2