leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
No need to check for NULL in send.c and disk-io.c.

Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
This commit is contained in:
Stefan Behrens
2013-05-13 14:42:57 +00:00
committed by Josef Bacik
parent 78a1068b28
commit b1b195969f
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2821,8 +2821,6 @@ retry_root_backup:
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;

8
fs/btrfs/send.c
View File

@@ -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_)
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;
} }
} }