diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-02-03 17:44:37 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-02-03 17:44:37 +1100 |
| commit | 0519178514c69bd15a14b8a81002b16db5f71dad (patch) | |
| tree | c516fd3148e9aa323ffbd5a7545b550e28a45320 /fs/ext4/namei.c | |
| parent | 68a9462de925abe75a9e347d5af9d12a60a314a1 (diff) | |
| parent | 97054281cad8234429c88eb82ecc22eaaf6d0ef5 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'fs/ext4/namei.c')
| -rw-r--r-- | fs/ext4/namei.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 2291923dae4e..28fe71a2904c 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2235,7 +2235,10 @@ retry: err = PTR_ERR(inode); if (!IS_ERR(inode)) { inode->i_op = &ext4_file_inode_operations; - inode->i_fop = &ext4_file_operations; + if (test_opt(inode->i_sb, DAX)) + inode->i_fop = &ext4_dax_file_operations; + else + inode->i_fop = &ext4_file_operations; ext4_set_aops(inode); err = ext4_add_nondir(handle, dentry, inode); if (!err && IS_DIRSYNC(dir)) @@ -2299,7 +2302,10 @@ retry: err = PTR_ERR(inode); if (!IS_ERR(inode)) { inode->i_op = &ext4_file_inode_operations; - inode->i_fop = &ext4_file_operations; + if (test_opt(inode->i_sb, DAX)) + inode->i_fop = &ext4_dax_file_operations; + else + inode->i_fop = &ext4_file_operations; ext4_set_aops(inode); d_tmpfile(dentry, inode); err = ext4_orphan_add(handle, inode); |