aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-11-13 17:23:54 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2015-12-06 20:43:25 -0500
commitfb417f13aec5f202d35fce9bc7b654e1d3a749e8 (patch)
treeac87ac7d1937ac69106d5d78c028b2d7883690e7
parent11803f97f0da4487ab947a975e5817fdc62a23e0 (diff)
logfs: don't duplicate page_symlink_inode_operations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/logfs/dir.c8
-rw-r--r--fs/logfs/inode.c2
-rw-r--r--fs/logfs/logfs.h1
3 files changed, 2 insertions, 9 deletions
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c
index f9b45d46d4c4..99944a406a29 100644
--- a/fs/logfs/dir.c
+++ b/fs/logfs/dir.c
@@ -528,7 +528,7 @@ static int logfs_symlink(struct inode *dir, struct dentry *dentry,
528 if (IS_ERR(inode)) 528 if (IS_ERR(inode))
529 return PTR_ERR(inode); 529 return PTR_ERR(inode);
530 530
531 inode->i_op = &logfs_symlink_iops; 531 inode->i_op = &page_symlink_inode_operations;
532 inode->i_mapping->a_ops = &logfs_reg_aops; 532 inode->i_mapping->a_ops = &logfs_reg_aops;
533 533
534 return __logfs_create(dir, dentry, inode, target, destlen); 534 return __logfs_create(dir, dentry, inode, target, destlen);
@@ -776,12 +776,6 @@ fail:
776 return -EIO; 776 return -EIO;
777} 777}
778 778
779const struct inode_operations logfs_symlink_iops = {
780 .readlink = generic_readlink,
781 .follow_link = page_follow_link_light,
782 .put_link = page_put_link,
783};
784
785const struct inode_operations logfs_dir_iops = { 779const struct inode_operations logfs_dir_iops = {
786 .create = logfs_create, 780 .create = logfs_create,
787 .link = logfs_link, 781 .link = logfs_link,
diff --git a/fs/logfs/inode.c b/fs/logfs/inode.c
index af49e2d6941a..06baa926a7a0 100644
--- a/fs/logfs/inode.c
+++ b/fs/logfs/inode.c
@@ -64,7 +64,7 @@ static void logfs_inode_setops(struct inode *inode)
64 inode->i_mapping->a_ops = &logfs_reg_aops; 64 inode->i_mapping->a_ops = &logfs_reg_aops;
65 break; 65 break;
66 case S_IFLNK: 66 case S_IFLNK:
67 inode->i_op = &logfs_symlink_iops; 67 inode->i_op = &page_symlink_inode_operations;
68 inode->i_mapping->a_ops = &logfs_reg_aops; 68 inode->i_mapping->a_ops = &logfs_reg_aops;
69 break; 69 break;
70 case S_IFSOCK: /* fall through */ 70 case S_IFSOCK: /* fall through */
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h
index 5f0937609465..209a26d84c38 100644
--- a/fs/logfs/logfs.h
+++ b/fs/logfs/logfs.h
@@ -495,7 +495,6 @@ static inline int logfs_get_sb_mtd(struct logfs_super *s, int mtdnr)
495#endif 495#endif
496 496
497/* dir.c */ 497/* dir.c */
498extern const struct inode_operations logfs_symlink_iops;
499extern const struct inode_operations logfs_dir_iops; 498extern const struct inode_operations logfs_dir_iops;
500extern const struct file_operations logfs_dir_fops; 499extern const struct file_operations logfs_dir_fops;
501int logfs_replay_journal(struct super_block *sb); 500int logfs_replay_journal(struct super_block *sb);