btrfs: remove check for BTRFS_FS_STATE_ERROR which we just set
authorAnand Jain <Anand.Jain@oracle.com>
Thu, 4 Jan 2018 10:01:54 +0000 (18:01 +0800)
committerDavid Sterba <dsterba@suse.com>
Mon, 22 Jan 2018 15:08:20 +0000 (16:08 +0100)
__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>
fs/btrfs/super.c

index 8af7590a56380cae9552193e55566ffb509696e5..786e8bc04f9c443e864f4dfd92fefaa9778f309c 100644 (file)
@@ -115,20 +115,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.
+        */
 }
 
 /*