Re: [PATCH 2/6] btrfs: remove set but not used variable err in btrfs_add_link

[Nikolay Borisov]

On 14.11.18 г. 15:35 ч., Johannes Thumshirn wrote:
> err holds the return value of either btrfs_del_root_ref() or
> btrfs_del_inode_ref() but it hasn't been checked since it's introduction with
> commit fe66a05a0679 (Btrfs: improve error handling for btrfs_insert_dir_item
> callers) in 2012.
> 
> As the error value hasn't been of any interest for 6 years we can just drop it
> as well.
> 
> Signed-off-by: Johannes Thumshirn <jthumsh...@suse.de>

Technically you are correct, given this is in error path I guess we can
live by ignoring error from those functions in this context. Ideally we
should strive to actually handle error wherever we can.

> ---
>  fs/btrfs/inode.c | 13 ++++++-------
>  1 file changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 7d17b0a654e6..57af243b3f59 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -6427,17 +6427,16 @@ int btrfs_add_link(struct btrfs_trans_handle *trans,
>  fail_dir_item:
>       if (unlikely(ino == BTRFS_FIRST_FREE_OBJECTID)) {
>               u64 local_index;
> -             int err;
> -             err = btrfs_del_root_ref(trans, key.objectid,
> -                                      root->root_key.objectid, parent_ino,
> -                                      &local_index, name, name_len);
> +
> +             btrfs_del_root_ref(trans, key.objectid,
> +                                root->root_key.objectid, parent_ino,
> +                                &local_index, name, name_len);
>  
>       } else if (add_backref) {
>               u64 local_index;
> -             int err;
>  
> -             err = btrfs_del_inode_ref(trans, root, name, name_len,
> -                                       ino, parent_ino, &local_index);
> +             btrfs_del_inode_ref(trans, root, name, name_len,
> +                                 ino, parent_ino, &local_index);
>       }
>       return ret;
>  }
>