Btrfs: cleanup, btrfs_read_fs_root_no_name() doesn't return NULL
PATCH v2 2/3 Btrfs: cleanup, btrfs_read_fs_root_no_name() doesn't return NULL
In reply to a message not in the archiveNo need to check for NULL in send.c and disk-io.c.
Signed-off-by Stefan Behrens <[email protected]>
---
v1 -> v2:
One more place where the check for NULL can be deleted.
fs/btrfs/disk-io.c | 2 -- fs/btrfs/send.c | 8 ++------ 2 files changed, 2 insertions(+), 8 deletions(-)
fs/btrfs/disk-io.c +0 -2
@@ -2757,8 +2757,6 @@ retry_root_backup: location.offset = (u64)-1 ; 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)) { err =PTR_ERR (fs_info->fs_root); goto fail_qgroup;
fs/btrfs/send.c +2 -6
@@ -4663,10 +4663,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;
@@ -4682,8 +4678,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; } }
Signature · 1 line
1.8.2.2