xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: remove check for BTRFS_FS_STATE_ERROR which we just set

Browse Source 
__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@oracle.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain
2018-01-04 18:01:54 +08:00
committed by David Sterba
parent 8810f7517a
commit 61ecda6865
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fs/btrfs/super.c
View File

@@ -115,20 +115,18 @@ static void btrfs_handle_error(struct btrfs_fs_info *fs_info)
if (sb_rdonly(sb)) if (sb_rdonly(sb))
return; return;
if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state)) { sb->s_flags |= SB_RDONLY;
sb->s_flags |= SB_RDONLY; btrfs_info(fs_info, "forced readonly");
btrfs_info(fs_info, "forced readonly"); /*
/* * Note that a running device replace operation is not
* Note that a running device replace operation is not * canceled here although there is no way to update
* canceled here although there is no way to update * the progress. It would add the risk of a deadlock,
* the progress. It would add the risk of a deadlock, * therefore the canceling is omitted. The only penalty
* therefore the canceling is omitted. The only penalty * is that some I/O remains active until the procedure
* is that some I/O remains active until the procedure * completes. The next time when the filesystem is
* completes. The next time when the filesystem is * mounted writeable again, the device replace
* mounted writeable again, the device replace * operation continues.
* operation continues. */
*/
}
} }
/* /*