Re: [PATCH 09/79] ext4: switch to simple_follow_link()

[Jan Kara]

On Tue 05-05-15 06:21:43, Al Viro wrote:
> From: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
> 
> for fast symlinks only, of course...
> 
> Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
  Looks good. You can add:
Reviewed-by: Jan Kara <jack@xxxxxxx>

								Honza

> ---
>  fs/ext4/inode.c   | 1 +
>  fs/ext4/namei.c   | 4 +++-
>  fs/ext4/symlink.c | 9 +--------
>  3 files changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index a320558..aba562b 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -4219,6 +4219,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
>  			BUILD_BUG();
>  #endif
>  		} else if (ext4_inode_is_fast_symlink(inode)) {
> +			inode->i_link = (char *)ei->i_data;
>  			inode->i_op = &ext4_fast_symlink_inode_operations;
>  			nd_terminate_link(ei->i_data, inode->i_size,
>  				sizeof(ei->i_data) - 1);
> diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
> index 84b1920..99017eb 100644
> --- a/fs/ext4/namei.c
> +++ b/fs/ext4/namei.c
> @@ -3311,8 +3311,10 @@ static int ext4_symlink(struct inode *dir,
>  	} else {
>  		/* clear the extent format for fast symlink */
>  		ext4_clear_inode_flag(inode, EXT4_INODE_EXTENTS);
> -		if (!encryption_required)
> +		if (!encryption_required) {
>  			inode->i_op = &ext4_fast_symlink_inode_operations;
> +			inode->i_link = (char *)&EXT4_I(inode)->i_data;
> +		}
>  		memcpy((char *)&EXT4_I(inode)->i_data, disk_link.name,
>  		       disk_link.len);
>  		inode->i_size = disk_link.len - 1;
> diff --git a/fs/ext4/symlink.c b/fs/ext4/symlink.c
> index 4ea5a01..1720a13 100644
> --- a/fs/ext4/symlink.c
> +++ b/fs/ext4/symlink.c
> @@ -106,13 +106,6 @@ const struct inode_operations ext4_encrypted_symlink_inode_operations = {
>  };
>  #endif
>  
> -static void *ext4_follow_fast_link(struct dentry *dentry, struct nameidata *nd)
> -{
> -	struct ext4_inode_info *ei = EXT4_I(d_inode(dentry));
> -	nd_set_link(nd, (char *) ei->i_data);
> -	return NULL;
> -}
> -
>  const struct inode_operations ext4_symlink_inode_operations = {
>  	.readlink	= generic_readlink,
>  	.follow_link	= page_follow_link_light,
> @@ -126,7 +119,7 @@ const struct inode_operations ext4_symlink_inode_operations = {
>  
>  const struct inode_operations ext4_fast_symlink_inode_operations = {
>  	.readlink	= generic_readlink,
> -	.follow_link    = ext4_follow_fast_link,
> +	.follow_link    = simple_follow_link,
>  	.setattr	= ext4_setattr,
>  	.setxattr	= generic_setxattr,
>  	.getxattr	= generic_getxattr,
> -- 
> 2.1.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
-- 
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
--
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/