Commit de38a206 authored by Anand Jain's avatar Anand Jain Committed by David Sterba

btrfs: open code check_barrier_error()

check_barrier_error() is almost a single line function, and just calls
btrfs_check_rw_degradable(). Instead, open code it.
Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent bfd3ea94
...@@ -4135,13 +4135,6 @@ static blk_status_t wait_dev_flush(struct btrfs_device *device) ...@@ -4135,13 +4135,6 @@ static blk_status_t wait_dev_flush(struct btrfs_device *device)
return bio->bi_status; return bio->bi_status;
} }
static int check_barrier_error(struct btrfs_fs_info *fs_info)
{
if (!btrfs_check_rw_degradable(fs_info, NULL))
return -EIO;
return 0;
}
/* /*
* send an empty flush down to each device in parallel, * send an empty flush down to each device in parallel,
* then wait for them * then wait for them
...@@ -4185,14 +4178,13 @@ static int barrier_all_devices(struct btrfs_fs_info *info) ...@@ -4185,14 +4178,13 @@ static int barrier_all_devices(struct btrfs_fs_info *info)
errors_wait++; errors_wait++;
} }
if (errors_wait) {
/* /*
* At some point we need the status of all disks * Checks last_flush_error of disks in order to determine the device
* to arrive at the volume status. So error checking * state.
* is being pushed to a separate loop.
*/ */
return check_barrier_error(info); if (errors_wait && !btrfs_check_rw_degradable(info, NULL))
} return -EIO;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment