From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751940AbcAEQ1I (ORCPT ); Tue, 5 Jan 2016 11:27:08 -0500 Received: from mx2.suse.de ([195.135.220.15]:45433 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751608AbcAEQ1F (ORCPT ); Tue, 5 Jan 2016 11:27:05 -0500 Date: Tue, 5 Jan 2016 17:27:10 +0100 From: Jan Kara To: Al Viro Cc: Linus Torvalds , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH 03/13] udf: don't duplicate page_symlink_inode_operations Message-ID: <20160105162710.GB18604@quack.suse.cz> References: <20160101063624.GG9938@ZenIV.linux.org.uk> <1451630301-30618-3-git-send-email-viro@ZenIV.linux.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1451630301-30618-3-git-send-email-viro@ZenIV.linux.org.uk> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri 01-01-16 06:38:11, Al Viro wrote: > From: Al Viro > > Signed-off-by: Al Viro Looks good. I guess it's more convenient for you to take this change through your tree so: Acked-by: Jan Kara 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@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Jan Kara SUSE Labs, CR