korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 20:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

btrfs: open code btrfs_read_fs_root_no_name

Browse Source 
All this does is call btrfs_get_fs_root() with check_ref == true.  Just
use btrfs_get_fs_root() so we don't have a bunch of different helpers
that do the same thing.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Josef Bacik 2020-01-24 09:32:24 -05:00 committed by David Sterba
parent 83db2aadb3
commit 3619c94f07
12 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/disk-io.c
View File

@ -3178,7 +3178,7 @@ int __cold open_ctree(struct super_block *sb,
location.type = BTRFS_ROOT_ITEM_KEY; location.type = BTRFS_ROOT_ITEM_KEY;
location.offset = 0; location.offset = 0;
fs_info->fs_root = btrfs_read_fs_root_no_name(fs_info, &location); fs_info->fs_root = btrfs_get_fs_root(fs_info, &location, true);
if (IS_ERR(fs_info->fs_root)) { if (IS_ERR(fs_info->fs_root)) {
err = PTR_ERR(fs_info->fs_root); err = PTR_ERR(fs_info->fs_root);
btrfs_warn(fs_info, "failed to read fs tree: %d", err); btrfs_warn(fs_info, "failed to read fs tree: %d", err);

6
fs/btrfs/disk-io.h
View File

@ -70,12 +70,6 @@ void btrfs_free_fs_roots(struct btrfs_fs_info *fs_info);
struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info, struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info,
struct btrfs_key *key, struct btrfs_key *key,
bool check_ref); bool check_ref);
static inline struct btrfs_root *
btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info,
struct btrfs_key *location)
{
return btrfs_get_fs_root(fs_info, location, true);
}
int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info); int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info);
void btrfs_btree_balance_dirty(struct btrfs_fs_info *fs_info); void btrfs_btree_balance_dirty(struct btrfs_fs_info *fs_info);

2
fs/btrfs/export.c
View File

@ -77,7 +77,7 @@ static struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,
index = srcu_read_lock(&fs_info->subvol_srcu); index = srcu_read_lock(&fs_info->subvol_srcu);
root = btrfs_read_fs_root_no_name(fs_info, &key); root = btrfs_get_fs_root(fs_info, &key, true);
if (IS_ERR(root)) { if (IS_ERR(root)) {
err = PTR_ERR(root); err = PTR_ERR(root);
goto fail; goto fail;

2
fs/btrfs/file.c
View File

@ -287,7 +287,7 @@ static int __btrfs_run_defrag_inode(struct btrfs_fs_info *fs_info,
index = srcu_read_lock(&fs_info->subvol_srcu); index = srcu_read_lock(&fs_info->subvol_srcu);
inode_root = btrfs_read_fs_root_no_name(fs_info, &key); inode_root = btrfs_get_fs_root(fs_info, &key, true);
if (IS_ERR(inode_root)) { if (IS_ERR(inode_root)) {
ret = PTR_ERR(inode_root); ret = PTR_ERR(inode_root);
goto cleanup; goto cleanup;

2
fs/btrfs/inode.c
View File

@ -5153,7 +5153,7 @@ static int fixup_tree_root_location(struct btrfs_fs_info *fs_info,
btrfs_release_path(path); btrfs_release_path(path);
new_root = btrfs_read_fs_root_no_name(fs_info, location); new_root = btrfs_get_fs_root(fs_info, location, true);
if (IS_ERR(new_root)) { if (IS_ERR(new_root)) {
err = PTR_ERR(new_root); err = PTR_ERR(new_root);
goto out; goto out;

12
fs/btrfs/ioctl.c
View File

@ -666,7 +666,7 @@ static noinline int create_subvol(struct inode *dir,
goto fail; goto fail;
key.offset = (u64)-1; key.offset = (u64)-1;
new_root = btrfs_read_fs_root_no_name(fs_info, &key); new_root = btrfs_get_fs_root(fs_info, &key, true);
if (IS_ERR(new_root)) { if (IS_ERR(new_root)) {
ret = PTR_ERR(new_root); ret = PTR_ERR(new_root);
btrfs_abort_transaction(trans, ret); btrfs_abort_transaction(trans, ret);
@ -2179,7 +2179,7 @@ static noinline int search_ioctl(struct inode *inode,
key.objectid = sk->tree_id; key.objectid = sk->tree_id;
key.type = BTRFS_ROOT_ITEM_KEY; key.type = BTRFS_ROOT_ITEM_KEY;
key.offset = (u64)-1; key.offset = (u64)-1;
root = btrfs_read_fs_root_no_name(info, &key); root = btrfs_get_fs_root(info, &key, true);
if (IS_ERR(root)) { if (IS_ERR(root)) {
btrfs_free_path(path); btrfs_free_path(path);
return PTR_ERR(root); return PTR_ERR(root);
@ -2314,7 +2314,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info,
key.objectid = tree_id; key.objectid = tree_id;
key.type = BTRFS_ROOT_ITEM_KEY; key.type = BTRFS_ROOT_ITEM_KEY;
key.offset = (u64)-1; key.offset = (u64)-1;
root = btrfs_read_fs_root_no_name(info, &key); root = btrfs_get_fs_root(info, &key, true);
if (IS_ERR(root)) { if (IS_ERR(root)) {
ret = PTR_ERR(root); ret = PTR_ERR(root);
goto out; goto out;
@ -2408,7 +2408,7 @@ static int btrfs_search_path_in_tree_user(struct inode *inode,
key.objectid = treeid; key.objectid = treeid;
key.type = BTRFS_ROOT_ITEM_KEY; key.type = BTRFS_ROOT_ITEM_KEY;
key.offset = (u64)-1; key.offset = (u64)-1;
root = btrfs_read_fs_root_no_name(fs_info, &key); root = btrfs_get_fs_root(fs_info, &key, true);
if (IS_ERR(root)) { if (IS_ERR(root)) {
ret = PTR_ERR(root); ret = PTR_ERR(root);
goto out; goto out;
@ -2653,7 +2653,7 @@ static int btrfs_ioctl_get_subvol_info(struct file *file, void __user *argp)
key.objectid = BTRFS_I(inode)->root->root_key.objectid; key.objectid = BTRFS_I(inode)->root->root_key.objectid;
key.type = BTRFS_ROOT_ITEM_KEY; key.type = BTRFS_ROOT_ITEM_KEY;
key.offset = (u64)-1; key.offset = (u64)-1;
root = btrfs_read_fs_root_no_name(fs_info, &key); root = btrfs_get_fs_root(fs_info, &key, true);
if (IS_ERR(root)) { if (IS_ERR(root)) {
ret = PTR_ERR(root); ret = PTR_ERR(root);
goto out; goto out;
@ -3983,7 +3983,7 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)
location.type = BTRFS_ROOT_ITEM_KEY; location.type = BTRFS_ROOT_ITEM_KEY;
location.offset = (u64)-1; location.offset = (u64)-1;
new_root = btrfs_read_fs_root_no_name(fs_info, &location); new_root = btrfs_get_fs_root(fs_info, &location, true);
if (IS_ERR(new_root)) { if (IS_ERR(new_root)) {
ret = PTR_ERR(new_root); ret = PTR_ERR(new_root);
goto out; goto out;

2
fs/btrfs/scrub.c
View File

@ -653,7 +653,7 @@ static int scrub_print_warning_inode(u64 inum, u64 offset, u64 root,
root_key.objectid = root; root_key.objectid = root;
root_key.type = BTRFS_ROOT_ITEM_KEY; root_key.type = BTRFS_ROOT_ITEM_KEY;
root_key.offset = (u64)-1; root_key.offset = (u64)-1;
local_root = btrfs_read_fs_root_no_name(fs_info, &root_key); local_root = btrfs_get_fs_root(fs_info, &root_key, true);
if (IS_ERR(local_root)) { if (IS_ERR(local_root)) {
ret = PTR_ERR(local_root); ret = PTR_ERR(local_root);
goto err; goto err;

4
fs/btrfs/send.c
View File

@ -7195,7 +7195,7 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg)
index = srcu_read_lock(&fs_info->subvol_srcu); index = srcu_read_lock(&fs_info->subvol_srcu);
clone_root = btrfs_read_fs_root_no_name(fs_info, &key); clone_root = btrfs_get_fs_root(fs_info, &key, true);
if (IS_ERR(clone_root)) { if (IS_ERR(clone_root)) {
srcu_read_unlock(&fs_info->subvol_srcu, index); srcu_read_unlock(&fs_info->subvol_srcu, index);
ret = PTR_ERR(clone_root); ret = PTR_ERR(clone_root);
@ -7234,7 +7234,7 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg)
index = srcu_read_lock(&fs_info->subvol_srcu); index = srcu_read_lock(&fs_info->subvol_srcu);
sctx->parent_root = btrfs_read_fs_root_no_name(fs_info, &key); sctx->parent_root = btrfs_get_fs_root(fs_info, &key, true);
if (IS_ERR(sctx->parent_root)) { if (IS_ERR(sctx->parent_root)) {
srcu_read_unlock(&fs_info->subvol_srcu, index); srcu_read_unlock(&fs_info->subvol_srcu, index);
ret = PTR_ERR(sctx->parent_root); ret = PTR_ERR(sctx->parent_root);

2
fs/btrfs/super.c
View File

@ -1096,7 +1096,7 @@ static char *get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,
key.objectid = subvol_objectid; key.objectid = subvol_objectid;
key.type = BTRFS_ROOT_ITEM_KEY; key.type = BTRFS_ROOT_ITEM_KEY;
key.offset = (u64)-1; key.offset = (u64)-1;
fs_root = btrfs_read_fs_root_no_name(fs_info, &key); fs_root = btrfs_get_fs_root(fs_info, &key, true);
if (IS_ERR(fs_root)) { if (IS_ERR(fs_root)) {
ret = PTR_ERR(fs_root); ret = PTR_ERR(fs_root);
goto err; goto err;

2
fs/btrfs/transaction.c
View File

@ -1633,7 +1633,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
} }
key.offset = (u64)-1; key.offset = (u64)-1;
pending->snap = btrfs_read_fs_root_no_name(fs_info, &key); pending->snap = btrfs_get_fs_root(fs_info, &key, true);
if (IS_ERR(pending->snap)) { if (IS_ERR(pending->snap)) {
ret = PTR_ERR(pending->snap); ret = PTR_ERR(pending->snap);
btrfs_abort_transaction(trans, ret); btrfs_abort_transaction(trans, ret);

2
fs/btrfs/tree-log.c
View File

@ -6162,7 +6162,7 @@ again:
tmp_key.type = BTRFS_ROOT_ITEM_KEY; tmp_key.type = BTRFS_ROOT_ITEM_KEY;
tmp_key.offset = (u64)-1; tmp_key.offset = (u64)-1;
wc.replay_dest = btrfs_read_fs_root_no_name(fs_info, &tmp_key); wc.replay_dest = btrfs_get_fs_root(fs_info, &tmp_key, true);
if (IS_ERR(wc.replay_dest)) { if (IS_ERR(wc.replay_dest)) {
ret = PTR_ERR(wc.replay_dest); ret = PTR_ERR(wc.replay_dest);

2
fs/btrfs/volumes.c
View File

@ -4424,7 +4424,7 @@ static int btrfs_check_uuid_tree_entry(struct btrfs_fs_info *fs_info,
key.objectid = subid; key.objectid = subid;
key.type = BTRFS_ROOT_ITEM_KEY; key.type = BTRFS_ROOT_ITEM_KEY;
key.offset = (u64)-1; key.offset = (u64)-1;
subvol_root = btrfs_read_fs_root_no_name(fs_info, &key); subvol_root = btrfs_get_fs_root(fs_info, &key, true);
if (IS_ERR(subvol_root)) { if (IS_ERR(subvol_root)) {
ret = PTR_ERR(subvol_root); ret = PTR_ERR(subvol_root);
if (ret == -ENOENT) if (ret == -ENOENT)