logfs: don't duplicate page_symlink_inode_operations (fb417f13) · Commits · 戴 / test

fs/logfs/dir.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -528,7 +528,7 @@ static int logfs_symlink(struct inode dir, struct dentry dentry,
		if (IS_ERR(inode))
		return PTR_ERR(inode);

		inode->i_op = &logfs_symlink_iops;
		inode->i_op = &page_symlink_inode_operations;
		inode->i_mapping->a_ops = &logfs_reg_aops;

		return __logfs_create(dir, dentry, inode, target, destlen);
		@@ -776,12 +776,6 @@ fail:
		return -EIO;
		}

		const struct inode_operations logfs_symlink_iops = {
		.readlink = generic_readlink,
		.follow_link = page_follow_link_light,
		.put_link = page_put_link,
		};

		const struct inode_operations logfs_dir_iops = {
		.create = logfs_create,
		.link = logfs_link,

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ static void logfs_inode_setops(struct inode *inode)
		inode->i_mapping->a_ops = &logfs_reg_aops;
		break;
		case S_IFLNK:
		inode->i_op = &logfs_symlink_iops;
		inode->i_op = &page_symlink_inode_operations;
		inode->i_mapping->a_ops = &logfs_reg_aops;
		break;
		case S_IFSOCK: /* fall through */

+0 −1

Original line number	Diff line number	Diff line
		@@ -495,7 +495,6 @@ static inline int logfs_get_sb_mtd(struct logfs_super *s, int mtdnr)
		#endif

		/* dir.c */
		extern const struct inode_operations logfs_symlink_iops;
		extern const struct inode_operations logfs_dir_iops;
		extern const struct file_operations logfs_dir_fops;
		int logfs_replay_journal(struct super_block *sb);