Commit b1b19596 authored by Stefan Behrens's avatar Stefan Behrens Committed by Josef Bacik

Btrfs: cleanup, btrfs_read_fs_root_no_name() doesn't return NULL

No need to check for NULL in send.c and disk-io.c.
Signed-off-by: default avatarStefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 78a1068b
...@@ -2821,8 +2821,6 @@ int open_ctree(struct super_block *sb, ...@@ -2821,8 +2821,6 @@ int open_ctree(struct super_block *sb,
location.offset = (u64)-1; location.offset = (u64)-1;
fs_info->fs_root = btrfs_read_fs_root_no_name(fs_info, &location); fs_info->fs_root = btrfs_read_fs_root_no_name(fs_info, &location);
if (!fs_info->fs_root)
goto fail_qgroup;
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);
goto fail_qgroup; goto fail_qgroup;
......
...@@ -4654,10 +4654,6 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) ...@@ -4654,10 +4654,6 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
key.type = BTRFS_ROOT_ITEM_KEY; key.type = BTRFS_ROOT_ITEM_KEY;
key.offset = (u64)-1; key.offset = (u64)-1;
clone_root = btrfs_read_fs_root_no_name(fs_info, &key); clone_root = btrfs_read_fs_root_no_name(fs_info, &key);
if (!clone_root) {
ret = -EINVAL;
goto out;
}
if (IS_ERR(clone_root)) { if (IS_ERR(clone_root)) {
ret = PTR_ERR(clone_root); ret = PTR_ERR(clone_root);
goto out; goto out;
...@@ -4673,8 +4669,8 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) ...@@ -4673,8 +4669,8 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
key.type = BTRFS_ROOT_ITEM_KEY; key.type = BTRFS_ROOT_ITEM_KEY;
key.offset = (u64)-1; key.offset = (u64)-1;
sctx->parent_root = btrfs_read_fs_root_no_name(fs_info, &key); sctx->parent_root = btrfs_read_fs_root_no_name(fs_info, &key);
if (!sctx->parent_root) { if (IS_ERR(sctx->parent_root)) {
ret = -EINVAL; ret = PTR_ERR(sctx->parent_root);
goto out; goto out;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment