[systemd-devel] [PATCH] fs: switch to d_splice_alias()

[Daniel Mack]

On 01/29/2015 05:42 AM, Bryan Hundven wrote:
> During the 3.19 merge window, two commits in Linus's tree:
> b5ae6b15bd73e35b129408755a0804287a87e041
> =====
> merge d_materialise_unique() into d_splice_alias()
> =====
> and
> 41d28bca2da4bd75a8915c1ccf2cacf7f4a2e531
> =====
> switch d_materialise_unique() users to d_splice_alias()
> =====
> 
> ...requires us to switch to d_splice_alias().
> 
> Signed-off-by: Bryan Hundven <bryanhundven at gmail.com>

Thanks! That's true, and I have the same patch locally as a fix-up the
kernel submission, after all, we did submit it as 3.19 material.

I'll wait for 3.19 to be released, and then apply your patch. There's
also another detail which uses a new API for kvec iterators. I'll add
that too.


Thanks,
Daniel



> ---
>  fs.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs.c b/fs.c
> index 7fc5ede..33aff4b 100644
> --- a/fs.c
> +++ b/fs.c
> @@ -175,7 +175,7 @@ static struct dentry *fs_dir_iop_lookup(struct inode *dir,
>  		if (IS_ERR(inode))
>  			dnew = ERR_CAST(inode);
>  		else
> -			dnew = d_materialise_unique(dentry, inode);
> +			dnew = d_splice_alias(inode, dentry);
>  
>  		kdbus_node_release(node);
>  	}
>