Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2db2fd95 authored by Ross Zwisler's avatar Ross Zwisler Committed by Greg Kroah-Hartman
Browse files

ext4: allow DAX writeback for hole punch 



commit cca32b7eeb4ea24fa6596650e06279ad9130af98 upstream.

Currently when doing a DAX hole punch with ext4 we fail to do a writeback.
This is because the logic around filemap_write_and_wait_range() in
ext4_punch_hole() only looks for dirty page cache pages in the radix tree,
not for dirty DAX exceptional entries.

Signed-off-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f6c12ce

fs/ext4/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -3645,7 +3645,7 @@ int ext4_update_disksize_before_punch(struct inode *inode, loff_t offset, 
}



/*

 * ext4_punch_hole: punches a hole in a file by releaseing the blocks

 * ext4_punch_hole: punches a hole in a file by releasing the blocks

 * associated with the given offset and length

 *

 * @inode:  File inode
@@ -3674,7 +3674,7 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length) 
	 * Write out all dirty pages to avoid race conditions

	 * Then release them.

	 */

	if (mapping->nrpages && mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) {

	if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) {

		ret = filemap_write_and_wait_range(mapping, offset,

						   offset + length - 1);

		if (ret)