diff options
| author | Stefan Behrens | 2013-05-13 16:42:57 +0200 |
|---|---|---|
| committer | Josef Bacik | 2013-06-14 17:29:29 +0200 |
| commit | b1b195969fe6d936f8c8bb63abf7efd2cc4cd5cf (patch) | |
| tree | 1a0d7212e262dbef9b47c157b749b03d5a349d63 /fs/btrfs/send.c | |
| parent | Btrfs: delete unused function (diff) | |
| download | kernel-qcow2-linux-b1b195969fe6d936f8c8bb63abf7efd2cc4cd5cf.tar.gz kernel-qcow2-linux-b1b195969fe6d936f8c8bb63abf7efd2cc4cd5cf.tar.xz kernel-qcow2-linux-b1b195969fe6d936f8c8bb63abf7efd2cc4cd5cf.zip | |
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: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs/btrfs/send.c')
| -rw-r--r-- | fs/btrfs/send.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index fedec7ba3537..dc43fed3f4bb 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -4654,10 +4654,6 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) key.type = BTRFS_ROOT_ITEM_KEY; key.offset = (u64)-1; clone_root = btrfs_read_fs_root_no_name(fs_info, &key); - if (!clone_root) { - ret = -EINVAL; - goto out; - } if (IS_ERR(clone_root)) { ret = PTR_ERR(clone_root); goto out; @@ -4673,8 +4669,8 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) key.type = BTRFS_ROOT_ITEM_KEY; key.offset = (u64)-1; sctx->parent_root = btrfs_read_fs_root_no_name(fs_info, &key); - if (!sctx->parent_root) { - ret = -EINVAL; + if (IS_ERR(sctx->parent_root)) { + ret = PTR_ERR(sctx->parent_root); goto out; } } |