ext4: avoid split extents for DAX writes

Currently mapping of blocks for DAX writes happen with
EXT4_GET_BLOCKS_PRE_IO flag set. That has a result that each
ext4_map_blocks() call creates a separate written extent, although it
could be merged to the neighboring extents in the extent tree.  The
reason for using this flag is that in case the extent is unwritten, we
need to convert it to written one and zero it out. However this "convert
mapped range to written" operation is already implemented by
ext4_map_blocks() for the case of data writes into unwritten extent. So
just use flags for that mode of operation, simplify the code, and avoid
unnecessary split extents.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 3941cee21e4cbd9307df07eadddd280a9417e604..29237f25ddbeb28d46071f2e7f0bc94102becf3c 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3359,7 +3359,6 @@ retry:
                        return PTR_ERR(handle);
 
                ret = ext4_map_blocks(handle, inode, &map,
-                                     EXT4_GET_BLOCKS_PRE_IO |
                                      EXT4_GET_BLOCKS_CREATE_ZERO);
                if (ret < 0) {
                        ext4_journal_stop(handle);
@@ -3368,22 +3367,6 @@ retry:
                                goto retry;
                        return ret;
                }
-               /* For DAX writes we need to zero out unwritten extents */
-               if (map.m_flags & EXT4_MAP_UNWRITTEN) {
-                       /*
-                        * We are protected by i_mmap_sem or i_rwsem so we know
-                        * block cannot go away from under us even though we
-                        * dropped i_data_sem. Convert extent to written and
-                        * write zeros there.
-                        */
-                       ret = ext4_map_blocks(handle, inode, &map,
-                                             EXT4_GET_BLOCKS_CONVERT |
-                                             EXT4_GET_BLOCKS_CREATE_ZERO);
-                       if (ret < 0) {
-                               ext4_journal_stop(handle);
-                               return ret;
-                       }
-               }
 
                /*
                 * If we added blocks beyond i_size we need to make sure they