1 files changed, 4 insertions, 10 deletions

diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 5d263dfdb3bc..1ee8c5539fa4 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1042,7 +1042,7 @@ out_trans_cancel:
         goto out_unlock;
 }
 
-static int
+int
 xfs_flush_unmap_range(
         struct xfs_inode        *ip,
         xfs_off_t               offset,
@@ -1126,9 +1126,9 @@ xfs_free_file_space(
          * page could be mmap'd and iomap_zero_range doesn't do that for us.
          * Writeback of the eof page will do this, albeit clumsily.
          */
-        if (offset + len >= XFS_ISIZE(ip) && ((offset + len) & PAGE_MASK)) {
+        if (offset + len >= XFS_ISIZE(ip) && offset_in_page(offset + len) > 0) {
                 error = filemap_write_and_wait_range(VFS_I(ip)->i_mapping,
-                                (offset + len) & ~PAGE_MASK, LLONG_MAX);
+                                round_down(offset + len, PAGE_SIZE), LLONG_MAX);
         }
 
         return error;
@@ -1195,13 +1195,7 @@ xfs_prepare_shift(
          * Writeback and invalidate cache for the remainder of the file as we're
          * about to shift down every extent from offset to EOF.
          */
-        error = filemap_write_and_wait_range(VFS_I(ip)->i_mapping, offset, -1);
-        if (error)
-                return error;
-        error = invalidate_inode_pages2_range(VFS_I(ip)->i_mapping,
-                                        offset >> PAGE_SHIFT, -1);
-        if (error)
-                return error;
+        error = xfs_flush_unmap_range(ip, offset, XFS_ISIZE(ip));
 
         /*
          * Clean out anything hanging around in the cow fork now that