1 files changed, 6 insertions, 7 deletions

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 735514ca400f..d89e08a81eda 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -273,11 +273,13 @@ void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
         inode->i_gid = le32_to_cpu(fe->i_gid);
 
         /* Fast symlinks will have i_size but no allocated clusters. */
-        if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
+        if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
                 inode->i_blocks = 0;
-        else
+                inode->i_mapping->a_ops = &ocfs2_fast_symlink_aops;
+        } else {
                 inode->i_blocks = ocfs2_inode_sector_count(inode);
-        inode->i_mapping->a_ops = &ocfs2_aops;
+                inode->i_mapping->a_ops = &ocfs2_aops;
+        }
         inode->i_atime.tv_sec = le64_to_cpu(fe->i_atime);
         inode->i_atime.tv_nsec = le32_to_cpu(fe->i_atime_nsec);
         inode->i_mtime.tv_sec = le64_to_cpu(fe->i_mtime);
@@ -331,10 +333,7 @@ void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
                     OCFS2_I(inode)->ip_dir_lock_gen = 1;
                     break;
             case S_IFLNK:
-                    if (ocfs2_inode_is_fast_symlink(inode))
-                        inode->i_op = &ocfs2_fast_symlink_inode_operations;
-                    else
-                        inode->i_op = &ocfs2_symlink_inode_operations;
+                    inode->i_op = &ocfs2_symlink_inode_operations;
                     i_size_write(inode, le64_to_cpu(fe->i_size));
                     break;
             default: