Merge remote-tracking branches 'regulator/fix/da9210' and 'regulator/fix/rk808' into...

[cascardo/linux.git] / fs / ext2 / namei.c

diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index 846c356..148f6e3 100644 (file)
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -35,7 +35,6 @@
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"
-#include "xip.h"
 
 static inline int ext2_add_nondir(struct dentry *dentry, struct inode *inode)
 {
@@ -105,9 +104,9 @@ 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, XIP)) {
-               inode->i_mapping->a_ops = &ext2_aops_xip;
-               inode->i_fop = &ext2_xip_file_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)) {
                inode->i_mapping->a_ops = &ext2_nobh_aops;
                inode->i_fop = &ext2_file_operations;
@@ -126,9 +125,9 @@ 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, XIP)) {
-               inode->i_mapping->a_ops = &ext2_aops_xip;
-               inode->i_fop = &ext2_xip_file_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)) {
                inode->i_mapping->a_ops = &ext2_nobh_aops;
                inode->i_fop = &ext2_file_operations;