Hi,
Please ignore this patch, it has been queued by Al for 4.20 in
https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git/commit/?h=for-next&id=8300807f9e2dffb6552514763ad60e005c12eb94
Sorry for bothering...
Thanks,
Gao Xiang
On 2018/10/13 1:59, Gao Xiang via Linux-erofs wrote:
> From: Al Viro <v...@zeniv.linux.org.uk>
>
> d_splice_alias() does the right thing when given
> ERR_PTR(-E...) for inode. No need for gotos, multiple
> returns, etc. in there.
>
> Signed-off-by: Al Viro <v...@zeniv.linux.org.uk>
> Reviewed-by: Gao Xiang <gaoxian...@huawei.com>
> Signed-off-by: Gao Xiang <gaoxian...@huawei.com>
> ---
> Hi,
>
> Frankly, I think it is a straight-forward cleanup by Al enough
> to be submitted to Linux 4.20 in constant to other pending fixes
> found in the process of EROFS productization these days, which
> I need more time to think over and fix formally to the community.
>
> p.s. I have no idea whether this patch has been already queued up
> in Al's fs tree for 4.20... :'( +Cc Greg / the staging mailing
> list as well. Or please ignore this email...
>
> Thanks,
> Gao Xiang
>
> drivers/staging/erofs/namei.c | 19 +++++++------------
> 1 file changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/erofs/namei.c b/drivers/staging/erofs/namei.c
> index 0039b76..5596c52 100644
> --- a/drivers/staging/erofs/namei.c
> +++ b/drivers/staging/erofs/namei.c
> @@ -223,18 +223,13 @@ static struct dentry *erofs_lookup(struct inode *dir,
> if (err == -ENOENT) {
> /* negative dentry */
> inode = NULL;
> - goto negative_out;
> - } else if (unlikely(err))
> - return ERR_PTR(err);
> -
> - debugln("%s, %s (nid %llu) found, d_type %u", __func__,
> - dentry->d_name.name, nid, d_type);
> -
> - inode = erofs_iget(dir->i_sb, nid, d_type == EROFS_FT_DIR);
> - if (IS_ERR(inode))
> - return ERR_CAST(inode);
> -
> -negative_out:
> + } else if (unlikely(err)) {
> + inode = ERR_PTR(err);
> + } else {
> + debugln("%s, %s (nid %llu) found, d_type %u", __func__,
> + dentry->d_name.name, nid, d_type);
> + inode = erofs_iget(dir->i_sb, nid, d_type == EROFS_FT_DIR);
> + }
> return d_splice_alias(inode, dentry);
> }
>
>
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
