xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'xfs-dax-fixes-4.6' into for-next

Browse Source
This commit is contained in:
Dave Chinner
2016-03-07 09:34:31 +11:00
parent 3d93ec0364 6448543735
commit 85a9f38d38
2 changed files with 102 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/xfs/xfs_iops.c
View File

@@ -1185,8 +1185,10 @@ xfs_diflags_to_iflags(
inode->i_flags |= S_SYNC;
if (flags & XFS_DIFLAG_NOATIME)
inode->i_flags |= S_NOATIME;
if (ip->i_mount->m_flags & XFS_MOUNT_DAX ||
ip->i_d.di_flags2 & XFS_DIFLAG2_DAX)
if (S_ISREG(inode->i_mode) &&
ip->i_mount->m_sb.sb_blocksize == PAGE_SIZE &&
(ip->i_mount->m_flags & XFS_MOUNT_DAX ||
ip->i_d.di_flags2 & XFS_DIFLAG2_DAX))
inode->i_flags |= S_DAX;
}