Re: [PATCH] CIFS: Remove pointless variable assignment in cifs_dfs_do_automount()

[Steve French]

merged - thx

On Sat, Jan 22, 2011 at 2:07 PM, Jesper Juhl <jj@xxxxxxxxxxxxx> wrote:
> In fs/cifs/cifs_dfs_ref.c::cifs_dfs_do_automount() we have this code:
>
>        ...
>        mnt = ERR_PTR(-EINVAL);
>        if (IS_ERR(tlink)) {
>                mnt = ERR_CAST(tlink);
>                goto free_full_path;
>        }
>        ses = tlink_tcon(tlink)->ses;
>
>        rc = get_dfs_path(xid, ses, full_path + 1, cifs_sb->local_nls,
>                &num_referrals, &referrals,
>                cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
>
>        cifs_put_tlink(tlink);
>
>        mnt = ERR_PTR(-ENOENT);
>        ...
>
> The assignment of 'mnt = ERR_PTR(-EINVAL);' is completely pointless. If we
> take the 'if (IS_ERR(tlink))' branch we'll set 'mnt' again and we'll also
> do so if we do not take the branch. There is no way we'll ever use 'mnt'
> with the assigned 'ERR_PTR(-EINVAL)' value, so we may as well just remove
> the pointless assignment.
>
> Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
> ---
>  cifs_dfs_ref.c |    1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c
> index 7ed3653..f1c6862 100644
> --- a/fs/cifs/cifs_dfs_ref.c
> +++ b/fs/cifs/cifs_dfs_ref.c
> @@ -297,7 +297,6 @@ static struct vfsmount *cifs_dfs_do_automount(struct dentry *mntpt)
>
>        cifs_sb = CIFS_SB(mntpt->d_inode->i_sb);
>        tlink = cifs_sb_tlink(cifs_sb);
> -       mnt = ERR_PTR(-EINVAL);
>        if (IS_ERR(tlink)) {
>                mnt = ERR_CAST(tlink);
>                goto free_full_path;
>
>
> --
> Jesper Juhl <jj@xxxxxxxxxxxxx>            http://www.chaosbits.net/
> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
> Plain text mails only, please.
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>



-- 
Thanks,

Steve
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/