xfs: log file size updates as part of unwritten extent conversion

If we convert and unwritten extent past the current i_size log the size update
as part of the extent manipulation transactions instead of doing an unlogged
metadata update later.

Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

2 files changed, 24 insertions, 6 deletions

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 745492b6c666..8e11b07bb281 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -179,13 +179,14 @@ xfs_end_io(
                         ioend->io_error = -error;
                         goto done;
                 }
+        } else {
+                /*
+                 * We might have to update the on-disk file size after
+                 * extending writes.
+                 */
+                xfs_setfilesize(ioend);
         }
 
-        /*
-         * We might have to update the on-disk file size after extending
-         * writes.
-         */
-        xfs_setfilesize(ioend);
 done:
         xfs_destroy_ioend(ioend);
 }
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 246c7d57c6f9..71a464503c43 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -31,6 +31,7 @@
 #include "xfs_ialloc_btree.h"
 #include "xfs_dinode.h"
 #include "xfs_inode.h"
+#include "xfs_inode_item.h"
 #include "xfs_btree.h"
 #include "xfs_bmap.h"
 #include "xfs_rtalloc.h"
@@ -645,6 +646,7 @@ xfs_iomap_write_unwritten(
         xfs_trans_t     *tp;
         xfs_bmbt_irec_t imap;
         xfs_bmap_free_t free_list;
+        xfs_fsize_t     i_size;
         uint            resblks;
         int             committed;
         int             error;
@@ -705,7 +707,22 @@ xfs_iomap_write_unwritten(
                 if (error)
                         goto error_on_bmapi_transaction;
 
-                error = xfs_bmap_finish(&(tp), &(free_list), &committed);
+                /*
+                 * Log the updated inode size as we go.  We have to be careful
+                 * to only log it up to the actual write offset if it is
+                 * halfway into a block.
+                 */
+                i_size = XFS_FSB_TO_B(mp, offset_fsb + count_fsb);
+                if (i_size > offset + count)
+                        i_size = offset + count;
+
+                i_size = xfs_new_eof(ip, i_size);
+                if (i_size) {
+                        ip->i_d.di_size = i_size;
+                        xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
+                }
+
+                error = xfs_bmap_finish(&tp, &free_list, &committed);
                 if (error)
                         goto error_on_bmapi_transaction;