ext3: switch to simple_follow_link() (115b4205) · Commits · 戴 / test

fs/ext3/inode.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2999,6 +2999,7 @@ struct inode ext3_iget(struct super_block sb, unsigned long ino)
		inode->i_op = &ext3_fast_symlink_inode_operations;
		nd_terminate_link(ei->i_data, inode->i_size,
		sizeof(ei->i_data) - 1);
		inode->i_link = (char *)ei->i_data;
		} else {
		inode->i_op = &ext3_symlink_inode_operations;
		ext3_set_aops(inode);

+2 −1

Original line number	Diff line number	Diff line
		@@ -2308,7 +2308,8 @@ retry:
		}
		} else {
		inode->i_op = &ext3_fast_symlink_inode_operations;
		memcpy((char*)&EXT3_I(inode)->i_data,symname,l);
		inode->i_link = (char*)&EXT3_I(inode)->i_data;
		memcpy(inode->i_link, symname, l);
		inode->i_size = l-1;
		}
		EXT3_I(inode)->i_disksize = inode->i_size;

+1 −9

Original line number	Diff line number	Diff line
		@@ -17,17 +17,9 @@
		* ext3 symlink handling code
		*/

		#include <linux/namei.h>
		#include "ext3.h"
		#include "xattr.h"

		static void * ext3_follow_link(struct dentry dentry, struct nameidata nd)
		{
		struct ext3_inode_info *ei = EXT3_I(d_inode(dentry));
		nd_set_link(nd, (char*)ei->i_data);
		return NULL;
		}

		const struct inode_operations ext3_symlink_inode_operations = {
		.readlink = generic_readlink,
		.follow_link = page_follow_link_light,
		@@ -43,7 +35,7 @@ const struct inode_operations ext3_symlink_inode_operations = {

		const struct inode_operations ext3_fast_symlink_inode_operations = {
		.readlink = generic_readlink,
		.follow_link = ext3_follow_link,
		.follow_link = simple_follow_link,
		.setattr = ext3_setattr,
		#ifdef CONFIG_EXT3_FS_XATTR
		.setxattr = generic_setxattr,