Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / fs / ext2 / inode.c

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index e1abf75e994cb9b63c22a64591149b0ed39164f4..5d9213963faee582c2520cede532f045e629c5d3 100644 (file)
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -1387,10 +1387,7 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
 
        if (S_ISREG(inode->i_mode)) {
                inode->i_op = &ext2_file_inode_operations;
-               if (test_opt(inode->i_sb, DAX)) {
-                       inode->i_mapping->a_ops = &ext2_aops;
-                       inode->i_fop = &ext2_dax_file_operations;
-               } else if (test_opt(inode->i_sb, NOBH)) {
+               if (test_opt(inode->i_sb, NOBH)) {
                        inode->i_mapping->a_ops = &ext2_nobh_aops;
                        inode->i_fop = &ext2_file_operations;
                } else {