dax: unify ext2/4_{dax,}_file_operations

[firefly-linux-kernel-4.4.55.git] / fs / ext2 / namei.c

diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index 148f6e3789eaea4fa7937ef019d9dbf23af36b60..ce422931f4114fff48d23a4887679a11c5341595 100644 (file)
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -104,10 +104,7 @@ static int ext2_create (struct inode * dir, struct dentry * dentry, umode_t mode
                return PTR_ERR(inode);
 
        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 {
@@ -125,10 +122,7 @@ static int ext2_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
                return PTR_ERR(inode);
 
        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 {