Commit 5e422f5e authored Oct 17, 2017 by Christoph Hellwig Committed by Darrick J. Wong Oct 26, 2017

xfs: fix incorrect extent state in xfs_bmap_add_extent_unwritten_real



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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

parent 232b5194

fs/xfs/libxfs/xfs_bmap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2560,7 +2560,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);

Admin message