summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_iops.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2016-06-21 09:55:18 +1000
committerDave Chinner <david@fromorbit.com>2016-06-21 09:55:18 +1000
commit459f0fbc2a827da37bbfaf3cae8da4ad8884da12 (patch)
tree80b44e5d30d805ee99a6bfdcbadbb535c5cae506 /fs/xfs/xfs_iops.c
parentd2bb140e99e6710c1b46e38a6347ada364aadfc6 (diff)
downloadlinux-stable-459f0fbc2a827da37bbfaf3cae8da4ad8884da12.tar.gz
linux-stable-459f0fbc2a827da37bbfaf3cae8da4ad8884da12.tar.bz2
linux-stable-459f0fbc2a827da37bbfaf3cae8da4ad8884da12.zip
xfs: use iomap infrastructure for DAX zeroing
Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/xfs_iops.c')
-rw-r--r--fs/xfs/xfs_iops.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 985a263c6144..ab820f84ed50 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -819,13 +819,8 @@ xfs_setattr_size(
if (newsize > oldsize) {
error = xfs_zero_eof(ip, newsize, oldsize, &did_zeroing);
} else {
- if (IS_DAX(inode)) {
- error = dax_truncate_page(inode, newsize,
- xfs_get_blocks_direct);
- } else {
- error = iomap_truncate_page(inode, newsize,
- &did_zeroing, &xfs_iomap_ops);
- }
+ error = iomap_truncate_page(inode, newsize, &did_zeroing,
+ &xfs_iomap_ops);
}
if (error)