Commit 2be4751b authored by Allison Henderson's avatar Allison Henderson Committed by Theodore Ts'o
Browse files

ext4: fix 2nd xfstests 127 punch hole failure 



This patch fixes a second punch hole bug found by xfstests 127.

This bug happens because punch hole needs to flush the pages
of the hole to avoid race conditions.  But if the end of the
hole is in the same page as i_size, the buffer heads beyond
i_size need to be unmapped and the page needs to be zeroed
after it is flushed.

To correct this, the new ext4_discard_partial_page_buffers
routine is used to zero and unmap the partial page
beyond i_size if the end of the hole appears in the same
page as i_size.

The code has also been optimized to set the end of the hole
to the page after i_size if the specified hole exceeds i_size,
and the code that flushes the pages has been simplified.

Signed-off-by: default avatarAllison Henderson <achender@linux.vnet.ibm.com>
parent ba06208a

fs/ext4/extents.c

+37 −4
Original line number Original line Diff line number Diff line
@@ -4166,6 +4166,20 @@ int ext4_ext_punch_hole(struct file *file, loff_t offset, loff_t length) 
	loff_t first_page_offset, last_page_offset;

	loff_t first_page_offset, last_page_offset;

	int ret, credits, blocks_released, err = 0;

	int ret, credits, blocks_released, err = 0;





	/* No need to punch hole beyond i_size */

	if (offset >= inode->i_size)

		return 0;



	/*

	 * If the hole extends beyond i_size, set the hole

	 * to end after the page that contains i_size

	 */

	if (offset + length > inode->i_size) {

		length = inode->i_size +

		   PAGE_CACHE_SIZE - (inode->i_size & (PAGE_CACHE_SIZE - 1)) -

		   offset;

	}



	first_block = (offset + sb->s_blocksize - 1) >>

	first_block = (offset + sb->s_blocksize - 1) >>

		EXT4_BLOCK_SIZE_BITS(sb);

		EXT4_BLOCK_SIZE_BITS(sb);

	last_block = (offset + length) >> EXT4_BLOCK_SIZE_BITS(sb);

	last_block = (offset + length) >> EXT4_BLOCK_SIZE_BITS(sb);
@@ -4182,8 +4196,7 @@ int ext4_ext_punch_hole(struct file *file, loff_t offset, loff_t length) 
	 */

	 */

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

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

		err = filemap_write_and_wait_range(mapping,

		err = filemap_write_and_wait_range(mapping,

			first_page_offset == 0 ? 0 : first_page_offset-1,

			offset, offset + length - 1);

			last_page_offset);





		if (err)

		if (err)

			return err;

			return err;
@@ -4249,6 +4262,26 @@ int ext4_ext_punch_hole(struct file *file, loff_t offset, loff_t length) 
		}

		}

	}

	}







	/*

	 * If i_size is contained in the last page, we need to

	 * unmap and zero the partial page after i_size

	 */

	if (inode->i_size >> PAGE_CACHE_SHIFT == last_page &&

	   inode->i_size % PAGE_CACHE_SIZE != 0) {



		page_len = PAGE_CACHE_SIZE -

			(inode->i_size & (PAGE_CACHE_SIZE - 1));



		if (page_len > 0) {

			err = ext4_discard_partial_page_buffers(handle,

			  mapping, inode->i_size, page_len, 0);



			if (err)

				goto out;

		}

	}



	/* If there are no blocks to remove, return now */

	/* If there are no blocks to remove, return now */

	if (first_block >= last_block)

	if (first_block >= last_block)

		goto out;

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE