ext4: switch to simple_follow_link() (75e7566b) · Commits · 戴 / test

fs/ext4/inode.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -4217,6 +4217,7 @@ struct inode ext4_iget(struct super_block sb, unsigned long ino)
		inode->i_op = &ext4_encrypted_symlink_inode_operations;
		ext4_set_aops(inode);
		} 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);

+3 −1

Original line number	Diff line number	Diff line
		@@ -3251,8 +3251,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;

+1 −8

Original line number	Diff line number	Diff line
		@@ -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,