projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'xfs-reflink-for-linus-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kerne...
[cascardo/linux.git]
/
fs
/
xfs
/
xfs_iops.c
diff --git
a/fs/xfs/xfs_iops.c
b/fs/xfs/xfs_iops.c
index
c5da95e
..
405a65c
100644
(file)
--- a/
fs/xfs/xfs_iops.c
+++ b/
fs/xfs/xfs_iops.c
@@
-1159,6
+1159,7
@@
xfs_diflags_to_iflags(
inode->i_flags |= S_NOATIME;
if (S_ISREG(inode->i_mode) &&
ip->i_mount->m_sb.sb_blocksize == PAGE_SIZE &&
+ !xfs_is_reflink_inode(ip) &&
(ip->i_mount->m_flags & XFS_MOUNT_DAX ||
ip->i_d.di_flags2 & XFS_DIFLAG2_DAX))
inode->i_flags |= S_DAX;