diff options
author | Anand Jain <anand.jain@oracle.com> | 2016-03-16 04:43:06 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2016-04-28 04:36:54 -0400 |
commit | 34d9700702f4042ce10d68a092ab7f79575e7a3b (patch) | |
tree | 49581d437ac92e6db4fe89122bf4875b4e21f902 /fs/btrfs/disk-io.c | |
parent | 02da2d72174c61988eb4456b53f405e3ebdebce4 (diff) |
btrfs: rename btrfs_std_error to btrfs_handle_fs_error
btrfs_std_error() handles errors, puts FS into readonly mode
(as of now). So its good idea to rename it to btrfs_handle_fs_error().
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
[ edit changelog ]
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r-- | fs/btrfs/disk-io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 4e47849d7427..aeb090583b78 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -2417,7 +2417,7 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info, | |||
2417 | /* returns with log_tree_root freed on success */ | 2417 | /* returns with log_tree_root freed on success */ |
2418 | ret = btrfs_recover_log_trees(log_tree_root); | 2418 | ret = btrfs_recover_log_trees(log_tree_root); |
2419 | if (ret) { | 2419 | if (ret) { |
2420 | btrfs_std_error(tree_root->fs_info, ret, | 2420 | btrfs_handle_fs_error(tree_root->fs_info, ret, |
2421 | "Failed to recover log tree"); | 2421 | "Failed to recover log tree"); |
2422 | free_extent_buffer(log_tree_root->node); | 2422 | free_extent_buffer(log_tree_root->node); |
2423 | kfree(log_tree_root); | 2423 | kfree(log_tree_root); |
@@ -3646,7 +3646,7 @@ static int write_all_supers(struct btrfs_root *root, int max_mirrors) | |||
3646 | if (ret) { | 3646 | if (ret) { |
3647 | mutex_unlock( | 3647 | mutex_unlock( |
3648 | &root->fs_info->fs_devices->device_list_mutex); | 3648 | &root->fs_info->fs_devices->device_list_mutex); |
3649 | btrfs_std_error(root->fs_info, ret, | 3649 | btrfs_handle_fs_error(root->fs_info, ret, |
3650 | "errors while submitting device barriers."); | 3650 | "errors while submitting device barriers."); |
3651 | return ret; | 3651 | return ret; |
3652 | } | 3652 | } |
@@ -3686,7 +3686,7 @@ static int write_all_supers(struct btrfs_root *root, int max_mirrors) | |||
3686 | mutex_unlock(&root->fs_info->fs_devices->device_list_mutex); | 3686 | mutex_unlock(&root->fs_info->fs_devices->device_list_mutex); |
3687 | 3687 | ||
3688 | /* FUA is masked off if unsupported and can't be the reason */ | 3688 | /* FUA is masked off if unsupported and can't be the reason */ |
3689 | btrfs_std_error(root->fs_info, -EIO, | 3689 | btrfs_handle_fs_error(root->fs_info, -EIO, |
3690 | "%d errors while writing supers", total_errors); | 3690 | "%d errors while writing supers", total_errors); |
3691 | return -EIO; | 3691 | return -EIO; |
3692 | } | 3692 | } |
@@ -3704,7 +3704,7 @@ static int write_all_supers(struct btrfs_root *root, int max_mirrors) | |||
3704 | } | 3704 | } |
3705 | mutex_unlock(&root->fs_info->fs_devices->device_list_mutex); | 3705 | mutex_unlock(&root->fs_info->fs_devices->device_list_mutex); |
3706 | if (total_errors > max_errors) { | 3706 | if (total_errors > max_errors) { |
3707 | btrfs_std_error(root->fs_info, -EIO, | 3707 | btrfs_handle_fs_error(root->fs_info, -EIO, |
3708 | "%d errors while writing supers", total_errors); | 3708 | "%d errors while writing supers", total_errors); |
3709 | return -EIO; | 3709 | return -EIO; |
3710 | } | 3710 | } |