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

Commit 769bca93 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

xfs: fix incorrect extent state in xfs_bmap_add_extent_unwritten_real 




[ Upstream commit 5e422f5e4fd71d18bc6b851eeb3864477b3d842e ]

There was one spot in xfs_bmap_add_extent_unwritten_real that didn't use the
passed in new extent state but always converted to normal, leading to wrong
behavior when converting from normal to unwritten.

Only found by code inspection, it seems like this code path to move partial
extent from written to unwritten while merging it with the next extent is
rarely exercised.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c8220994

fs/xfs/libxfs/xfs_bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -2713,7 +2713,7 @@ xfs_bmap_add_extent_unwritten_real( 
					&i)))

				goto done;

			XFS_WANT_CORRUPTED_GOTO(mp, i == 0, done);

			cur->bc_rec.b.br_state = XFS_EXT_NORM;

			cur->bc_rec.b.br_state = new->br_state;

			if ((error = xfs_btree_insert(cur, &i)))

				goto done;

			XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);