aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/tree-log.c
diff options
context:
space:
mode:
authorAnand Jain <anand.jain@oracle.com>2016-03-16 04:43:06 -0400
committerDavid Sterba <dsterba@suse.com>2016-04-28 04:36:54 -0400
commit34d9700702f4042ce10d68a092ab7f79575e7a3b (patch)
tree49581d437ac92e6db4fe89122bf4875b4e21f902 /fs/btrfs/tree-log.c
parent02da2d72174c61988eb4456b53f405e3ebdebce4 (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/tree-log.c')
-rw-r--r--fs/btrfs/tree-log.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 517d0ccb351e..16a74d1a2720 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -5519,7 +5519,7 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree)
5519 5519
5520 ret = walk_log_tree(trans, log_root_tree, &wc); 5520 ret = walk_log_tree(trans, log_root_tree, &wc);
5521 if (ret) { 5521 if (ret) {
5522 btrfs_std_error(fs_info, ret, "Failed to pin buffers while " 5522 btrfs_handle_fs_error(fs_info, ret, "Failed to pin buffers while "
5523 "recovering log root tree."); 5523 "recovering log root tree.");
5524 goto error; 5524 goto error;
5525 } 5525 }
@@ -5533,7 +5533,7 @@ again:
5533 ret = btrfs_search_slot(NULL, log_root_tree, &key, path, 0, 0); 5533 ret = btrfs_search_slot(NULL, log_root_tree, &key, path, 0, 0);
5534 5534
5535 if (ret < 0) { 5535 if (ret < 0) {
5536 btrfs_std_error(fs_info, ret, 5536 btrfs_handle_fs_error(fs_info, ret,
5537 "Couldn't find tree log root."); 5537 "Couldn't find tree log root.");
5538 goto error; 5538 goto error;
5539 } 5539 }
@@ -5551,7 +5551,7 @@ again:
5551 log = btrfs_read_fs_root(log_root_tree, &found_key); 5551 log = btrfs_read_fs_root(log_root_tree, &found_key);
5552 if (IS_ERR(log)) { 5552 if (IS_ERR(log)) {
5553 ret = PTR_ERR(log); 5553 ret = PTR_ERR(log);
5554 btrfs_std_error(fs_info, ret, 5554 btrfs_handle_fs_error(fs_info, ret,
5555 "Couldn't read tree log root."); 5555 "Couldn't read tree log root.");
5556 goto error; 5556 goto error;
5557 } 5557 }
@@ -5566,7 +5566,7 @@ again:
5566 free_extent_buffer(log->node); 5566 free_extent_buffer(log->node);
5567 free_extent_buffer(log->commit_root); 5567 free_extent_buffer(log->commit_root);
5568 kfree(log); 5568 kfree(log);
5569 btrfs_std_error(fs_info, ret, "Couldn't read target root " 5569 btrfs_handle_fs_error(fs_info, ret, "Couldn't read target root "
5570 "for tree log recovery."); 5570 "for tree log recovery.");
5571 goto error; 5571 goto error;
5572 } 5572 }