On 4.01.2018 12:01, Anand Jain wrote:
> __btrfs_handle_fs_error() sets BTRFS_FS_STATE_ERROR, and calls
> btrfs_handle_error() so no need to check if the BTRFS_FS_STATE_ERROR
> is set in btrfs_handle_error(). And there is no other user of
> btrfs_handle_error() as well.
>
> Signed-off-by: Anand Jain <anand.jain@xxxxxxxxxx>
Reviewed-by: Nikolay Borisov <nborisov@xxxxxxxx>
> ---
> fs/btrfs/super.c | 26 ++++++++++++--------------
> 1 file changed, 12 insertions(+), 14 deletions(-)
>
> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
> index 4c49bb5632a2..60766f8ca434 100644
> --- a/fs/btrfs/super.c
> +++ b/fs/btrfs/super.c
> @@ -113,20 +113,18 @@ static void btrfs_handle_error(struct btrfs_fs_info *fs_info)
> if (sb_rdonly(sb))
> return;
>
> - if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state)) {
> - sb->s_flags |= SB_RDONLY;
> - btrfs_info(fs_info, "forced readonly");
> - /*
> - * Note that a running device replace operation is not
> - * canceled here although there is no way to update
> - * the progress. It would add the risk of a deadlock,
> - * therefore the canceling is omitted. The only penalty
> - * is that some I/O remains active until the procedure
> - * completes. The next time when the filesystem is
> - * mounted writeable again, the device replace
> - * operation continues.
> - */
> - }
> + sb->s_flags |= SB_RDONLY;
> + btrfs_info(fs_info, "forced readonly");
> + /*
> + * Note that a running device replace operation is not
> + * canceled here although there is no way to update
> + * the progress. It would add the risk of a deadlock,
> + * therefore the canceling is omitted. The only penalty
> + * is that some I/O remains active until the procedure
> + * completes. The next time when the filesystem is
> + * mounted writeable again, the device replace
> + * operation continues.
> + */
> }
>
> /*
>
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
