Commit 9b940f8e authored by Allison Henderson's avatar Allison Henderson Committed by Theodore Ts'o
Browse files

ext4: ext4_ext_convert_to_initialized bug found in extended FSX testing 



This patch addresses bugs found while testing punch hole 
with the fsx test.  The patch corrects the number of blocks
that are zeroed out while splitting an extent, and also corrects
the return value to return the number of blocks split out, instead
of the number of blocks zeroed out.

This patch has been tested in addition to the following patches: 
[Ext4 punch hole v7]
[XFS Tests Punch Hole 1/1 v2] Add Punch Hole Testing to FSX

The test ran successfully for 24 hours.

Signed-off-by: default avatarAllison Henderson <achender@us.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 0b268590

fs/ext4/extents.c

+4 −5
Original line number Diff line number Diff line
@@ -2818,8 +2818,8 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, 
		    (EXT4_EXT_MAY_ZEROOUT & split_flag)) {

			/* case 3 */

			zero_ex.ee_block =

					 cpu_to_le32(map->m_lblk + map->m_len);

			zero_ex.ee_len = cpu_to_le16(allocated - map->m_len);

					 cpu_to_le32(map->m_lblk);

			zero_ex.ee_len = cpu_to_le16(allocated);

			ext4_ext_store_pblock(&zero_ex,

				ext4_ext_pblock(ex) + map->m_lblk - ee_block);

			err = ext4_ext_zeroout(inode, &zero_ex);
@@ -2842,10 +2842,9 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, 
					goto out;

			}



			allocated = map->m_lblk - ee_block + map->m_len;



			split_map.m_lblk = ee_block;

			split_map.m_len = allocated;

			split_map.m_len = map->m_lblk - ee_block + map->m_len;

			allocated = map->m_len;

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE