shmem: switch to simple_follow_link() (60380f19) · Commits · 戴 / test

mm/shmem.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -2451,6 +2451,7 @@ static int shmem_symlink(struct inode dir, struct dentry dentry, const char *s
		return -ENOMEM;
		}
		inode->i_op = &shmem_short_symlink_operations;
		inode->i_link = info->symlink;
		} else {
		error = shmem_getpage(inode, 0, &page, SGP_WRITE, NULL);
		if (error) {
		@@ -2474,12 +2475,6 @@ static int shmem_symlink(struct inode dir, struct dentry dentry, const char *s
		return 0;
		}

		static void shmem_follow_short_symlink(struct dentry dentry, struct nameidata *nd)
		{
		nd_set_link(nd, SHMEM_I(d_inode(dentry))->symlink);
		return NULL;
		}

		static void shmem_follow_link(struct dentry dentry, struct nameidata *nd)
		{
		struct page *page = NULL;
		@@ -2642,7 +2637,7 @@ static ssize_t shmem_listxattr(struct dentry dentry, char buffer, size_t size)

		static const struct inode_operations shmem_short_symlink_operations = {
		.readlink = generic_readlink,
		.follow_link = shmem_follow_short_symlink,
		.follow_link = simple_follow_link,
		#ifdef CONFIG_TMPFS_XATTR
		.setxattr = shmem_setxattr,
		.getxattr = shmem_getxattr,