diff options
| author | Chris Mason <clm@fb.com> | 2016-05-17 14:24:44 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-05-17 14:24:44 -0700 |
| commit | a88336d13c66fc171f336c6332fcb67339894e08 (patch) | |
| tree | 595935ba3afc91dce9be83ca65932f3cf1379436 /fs/btrfs/root-tree.c | |
| parent | 02da2d72174c61988eb4456b53f405e3ebdebce4 (diff) | |
| parent | 680834ca0ad4e9827048d4bda1e38db69c3dd1e4 (diff) | |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7
Diffstat (limited to 'fs/btrfs/root-tree.c')
| -rw-r--r-- | fs/btrfs/root-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c index 9fcd6dfc3266..b2b14e7115f1 100644 --- a/fs/btrfs/root-tree.c +++ b/fs/btrfs/root-tree.c @@ -284,7 +284,7 @@ int btrfs_find_orphan_roots(struct btrfs_root *tree_root) trans = btrfs_join_transaction(tree_root); if (IS_ERR(trans)) { err = PTR_ERR(trans); - btrfs_std_error(tree_root->fs_info, err, + btrfs_handle_fs_error(tree_root->fs_info, err, "Failed to start trans to delete " "orphan item"); break; @@ -293,7 +293,7 @@ int btrfs_find_orphan_roots(struct btrfs_root *tree_root) root_key.objectid); btrfs_end_transaction(trans, tree_root); if (err) { - btrfs_std_error(tree_root->fs_info, err, + btrfs_handle_fs_error(tree_root->fs_info, err, "Failed to delete root orphan " "item"); break; |