ocfs: simplify symlink handling

seeing that "fast" symlinks still get allocation + copy, we might as
well simply switch them to pagecache-based variant of ->follow_link();
just need an appropriate ->readpage() for them...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 3 insertions, 2 deletions

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index a9856e3eaaf0..9f39c640cddf 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -1724,15 +1724,16 @@ static int ocfs2_symlink(struct inode *dir,
         fe = (struct ocfs2_dinode *) new_fe_bh->b_data;
         inode->i_rdev = 0;
         newsize = l - 1;
+        inode->i_op = &ocfs2_symlink_inode_operations;
         if (l > ocfs2_fast_symlink_chars(sb)) {
                 u32 offset = 0;
 
-                inode->i_op = &ocfs2_symlink_inode_operations;
                 status = dquot_alloc_space_nodirty(inode,
                     ocfs2_clusters_to_bytes(osb->sb, 1));
                 if (status)
                         goto bail;
                 did_quota = 1;
+                inode->i_mapping->a_ops = &ocfs2_aops;
                 status = ocfs2_add_inode_data(osb, inode, &offset, 1, 0,
                                               new_fe_bh,
                                               handle, data_ac, NULL,
@@ -1750,7 +1751,7 @@ static int ocfs2_symlink(struct inode *dir,
                 i_size_write(inode, newsize);
                 inode->i_blocks = ocfs2_inode_sector_count(inode);
         } else {
-                inode->i_op = &ocfs2_fast_symlink_inode_operations;
+                inode->i_mapping->a_ops = &ocfs2_fast_symlink_aops;
                 memcpy((char *) fe->id2.i_symlink, symname, l);
                 i_size_write(inode, newsize);
                 inode->i_blocks = 0;