[PATCH 5/7] xfs: reshuffle truncate

[Christoph Hellwig <hch@xxxxxx>]

---
 fs/xfs/xfs_iops.c | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index fb7dc61..1aab9f6 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -790,20 +790,35 @@ xfs_setattr_size(
                return error;
 
        /*
+        * Wait for all direct I/O to complete.
+        */
+       inode_dio_wait(inode);
+
+       /*
         * File data changes must be complete before we start the transaction to
         * modify the inode.  This needs to be done before joining the inode to
         * the transaction because the inode cannot be unlocked once it is a
         * part of the transaction.
         *
-        * Start with zeroing any data block beyond EOF that we may expose on
-        * file extension.
+        * Start with zeroing any data beyond EOF that we may expose on file
+        & extension, or zeroing out the rest of the block on a downward
+        * truncate.
         */
        if (newsize > oldsize) {
                error = xfs_zero_eof(ip, newsize, oldsize, &did_zeroing);
-               if (error)
-                       return error;
+       } else {
+               if (IS_DAX(inode)) {
+                       error = dax_truncate_page(inode, newsize,
+                                       xfs_get_blocks_direct);
+               } else {
+                       error = block_truncate_page(inode->i_mapping, newsize,
+                                       xfs_get_blocks);
+               }
        }
 
+       if (error)
+               return error;
+
        /*
         * We are going to log the inode size change in this transaction so
         * any previous writes that are beyond the on disk EOF and the new
@@ -820,9 +835,6 @@ xfs_setattr_size(
                        return error;
        }
 
-       /* Now wait for all direct I/O to complete. */
-       inode_dio_wait(inode);
-
        /*
         * We've already locked out new page faults, so now we can safely remove
         * pages from the page cache knowing they won't get refaulted until we
@@ -840,13 +852,6 @@ xfs_setattr_size(
         * to hope that the caller sees ENOMEM and retries the truncate
         * operation.
         */
-       if (IS_DAX(inode))
-               error = dax_truncate_page(inode, newsize, 
xfs_get_blocks_direct);
-       else
-               error = block_truncate_page(inode->i_mapping, newsize,
-                                           xfs_get_blocks);
-       if (error)
-               return error;
        truncate_setsize(inode, newsize);
 
        tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_SIZE);
-- 
2.1.4