X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fs%2Fext2%2Finode.c;h=f460ae36d5b78addfd9cc1a6eb6c4287887a946e;hb=9ec3a646fe09970f801ab15e0f1694060b9f19af;hp=99a747cacf588a56080f5b8a2f1fa627d384557e;hpb=3cab989afd8d8d1bc3d99fef0e7ed87c31e7b647;p=linux-2.6-block.git

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 99a747cacf58..f460ae36d5b7 100644
--- 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 {