Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752615AbbEFNlG (ORCPT ); Wed, 6 May 2015 09:41:06 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:35887 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751638AbbEFNk1 (ORCPT ); Wed, 6 May 2015 09:40:27 -0400 Message-ID: <554A19A8.80601@oracle.com> Date: Wed, 06 May 2015 08:39:52 -0500 From: Dave Kleikamp User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Al Viro , Linus Torvalds CC: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH 16/79] jfs: switch to simple_follow_link() References: <20150505052205.GS889@ZenIV.linux.org.uk> <1430803373-4948-16-git-send-email-viro@ZenIV.linux.org.uk> In-Reply-To: <1430803373-4948-16-git-send-email-viro@ZenIV.linux.org.uk> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2795 Lines: 86 On 05/05/2015 12:21 AM, Al Viro wrote: > From: Al Viro > > Signed-off-by: Al Viro Acked-by: Dave Kleikamp > --- > fs/jfs/inode.c | 3 ++- > fs/jfs/namei.c | 5 ++--- > fs/jfs/symlink.c | 10 +--------- > 3 files changed, 5 insertions(+), 13 deletions(-) > > diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c > index 070dc4b..6f1cb2b 100644 > --- a/fs/jfs/inode.c > +++ b/fs/jfs/inode.c > @@ -63,11 +63,12 @@ struct inode *jfs_iget(struct super_block *sb, unsigned long ino) > inode->i_mapping->a_ops = &jfs_aops; > } else { > inode->i_op = &jfs_fast_symlink_inode_operations; > + inode->i_link = JFS_IP(inode)->i_inline; > /* > * The inline data should be null-terminated, but > * don't let on-disk corruption crash the kernel > */ > - JFS_IP(inode)->i_inline[inode->i_size] = '\0'; > + inode->i_link[inode->i_size] = '\0'; > } > } else { > inode->i_op = &jfs_file_inode_operations; > diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c > index 66db7bc..e33be92 100644 > --- a/fs/jfs/namei.c > +++ b/fs/jfs/namei.c > @@ -880,7 +880,6 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry, > int ssize; /* source pathname size */ > struct btstack btstack; > struct inode *ip = d_inode(dentry); > - unchar *i_fastsymlink; > s64 xlen = 0; > int bmask = 0, xsize; > s64 xaddr; > @@ -946,8 +945,8 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry, > if (ssize <= IDATASIZE) { > ip->i_op = &jfs_fast_symlink_inode_operations; > > - i_fastsymlink = JFS_IP(ip)->i_inline; > - memcpy(i_fastsymlink, name, ssize); > + ip->i_link = JFS_IP(ip)->i_inline; > + memcpy(ip->i_link, name, ssize); > ip->i_size = ssize - 1; > > /* > diff --git a/fs/jfs/symlink.c b/fs/jfs/symlink.c > index 80f42bc..5929e23 100644 > --- a/fs/jfs/symlink.c > +++ b/fs/jfs/symlink.c > @@ -17,21 +17,13 @@ > */ > > #include > -#include > #include "jfs_incore.h" > #include "jfs_inode.h" > #include "jfs_xattr.h" > > -static void *jfs_follow_link(struct dentry *dentry, struct nameidata *nd) > -{ > - char *s = JFS_IP(d_inode(dentry))->i_inline; > - nd_set_link(nd, s); > - return NULL; > -} > - > const struct inode_operations jfs_fast_symlink_inode_operations = { > .readlink = generic_readlink, > - .follow_link = jfs_follow_link, > + .follow_link = simple_follow_link, > .setattr = jfs_setattr, > .setxattr = jfs_setxattr, > .getxattr = jfs_getxattr, > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/