[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20160105162710.GB18604@quack.suse.cz>
Date: Tue, 5 Jan 2016 17:27:10 +0100
From: Jan Kara <jack@...e.cz>
To: Al Viro <viro@...IV.linux.org.uk>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
linux-kernel@...r.kernel.org, linux-fsdevel@...r.kernel.org
Subject: Re: [PATCH 03/13] udf: don't duplicate page_symlink_inode_operations
On Fri 01-01-16 06:38:11, Al Viro wrote:
> From: Al Viro <viro@...iv.linux.org.uk>
>
> Signed-off-by: Al Viro <viro@...iv.linux.org.uk>
Looks good. I guess it's more convenient for you to take this change
through your tree so:
Acked-by: Jan Kara <jack@...e.cz>
Honza
> ---
> fs/udf/inode.c | 2 +-
> fs/udf/namei.c | 7 +------
> fs/udf/udfdecl.h | 1 -
> 3 files changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/fs/udf/inode.c b/fs/udf/inode.c
> index 8d0b3ad..8675c2b 100644
> --- a/fs/udf/inode.c
> +++ b/fs/udf/inode.c
> @@ -1540,7 +1540,7 @@ reread:
> break;
> case ICBTAG_FILE_TYPE_SYMLINK:
> inode->i_data.a_ops = &udf_symlink_aops;
> - inode->i_op = &udf_symlink_inode_operations;
> + inode->i_op = &page_symlink_inode_operations;
> inode->i_mode = S_IFLNK | S_IRWXUGO;
> break;
> case ICBTAG_FILE_TYPE_MAIN:
> diff --git a/fs/udf/namei.c b/fs/udf/namei.c
> index c97b5a8..d0e6de1 100644
> --- a/fs/udf/namei.c
> +++ b/fs/udf/namei.c
> @@ -921,7 +921,7 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry,
> }
>
> inode->i_data.a_ops = &udf_symlink_aops;
> - inode->i_op = &udf_symlink_inode_operations;
> + inode->i_op = &page_symlink_inode_operations;
>
> if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) {
> struct kernel_lb_addr eloc;
> @@ -1344,8 +1344,3 @@ const struct inode_operations udf_dir_inode_operations = {
> .rename = udf_rename,
> .tmpfile = udf_tmpfile,
> };
> -const struct inode_operations udf_symlink_inode_operations = {
> - .readlink = generic_readlink,
> - .follow_link = page_follow_link_light,
> - .put_link = page_put_link,
> -};
> diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
> index 47bb3f5..ce169b4 100644
> --- a/fs/udf/udfdecl.h
> +++ b/fs/udf/udfdecl.h
> @@ -85,7 +85,6 @@ extern const struct inode_operations udf_dir_inode_operations;
> extern const struct file_operations udf_dir_operations;
> extern const struct inode_operations udf_file_inode_operations;
> extern const struct file_operations udf_file_operations;
> -extern const struct inode_operations udf_symlink_inode_operations;
> extern const struct address_space_operations udf_aops;
> extern const struct address_space_operations udf_adinicb_aops;
> extern const struct address_space_operations udf_symlink_aops;
> --
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Jan Kara <jack@...e.com>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists