btrfs: kill btrfs_read_fs_root

All helpers should either be using btrfs_get_fs_root() or
btrfs_read_tree_root().

Signed-off-by: Josef Bacik <josef@toxicpanda.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 2b91c40df27ad95965943b1796b1ebe50036081f..e3957d6b6babba2329a2986585a4e4eda7792432 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1439,17 +1439,6 @@ alloc_fail:
        goto out;
 }
 
-struct btrfs_root *btrfs_read_fs_root(struct btrfs_root *tree_root,
-                                     struct btrfs_key *location)
-{
-       struct btrfs_root *root;
-
-       root = btrfs_read_tree_root(tree_root, location);
-       if (IS_ERR(root))
-               return root;
-       return root;
-}
-
 int btrfs_init_fs_root(struct btrfs_root *root)
 {
        int ret;
@@ -1570,7 +1559,7 @@ again:
                return root;
        }
 
-       root = btrfs_read_fs_root(fs_info->tree_root, location);
+       root = btrfs_read_tree_root(fs_info->tree_root, location);
        if (IS_ERR(root))
                return root;
 

diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h
index cb12dd4825dabcd35e625e6c6a215344ebebe093..614802bd709dcf809d128a32edcaa7df75c34393 100644 (file)
--- a/fs/btrfs/disk-io.h
+++ b/fs/btrfs/disk-io.h
@@ -60,8 +60,6 @@ int btrfs_read_dev_one_super(struct block_device *bdev, int copy_num,
 int btrfs_commit_super(struct btrfs_fs_info *fs_info);
 struct btrfs_root *btrfs_read_tree_root(struct btrfs_root *tree_root,
                                        struct btrfs_key *key);
-struct btrfs_root *btrfs_read_fs_root(struct btrfs_root *tree_root,
-                                     struct btrfs_key *location);
 int btrfs_init_fs_root(struct btrfs_root *root);
 struct btrfs_root *btrfs_lookup_fs_root(struct btrfs_fs_info *fs_info,
                                        u64 root_id);