diff options
| author | David Sterba <dsterba@suse.com> | 2016-05-16 16:46:24 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-05-16 16:46:24 +0300 |
| commit | 5ef64a3e757c94b2f2fc61465ef9603aaacaecff (patch) | |
| tree | 5f8da3043723e98e8313ebf180fe84a9a12b8db0 /fs/btrfs/root-tree.c | |
| parent | 73d32ce21e1701eaafcea3cbc2a8f27ab1967abe (diff) | |
| parent | e1860a7724828a341037b010b3f4ff58bad53f95 (diff) | |
| download | linux-5ef64a3e757c94b2f2fc61465ef9603aaacaecff.tar.xz | |
Merge branch 'cleanups-4.7' into for-chris-4.7-20160516
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; |