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

Commit 0173c689 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: use correct state defines in xfs_bmap_del_extent_{cow,delay} 



Use the _FILLING values to match the usage in the xfs_bmap_add_extent_*
helpers.  No change in behavior, just better naming in the code and
tracepoint output.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reported-by: default avatarBrian Foster <bfoster@redhat.com>
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>
parent 1b24b633

fs/xfs/libxfs/xfs_bmap.c

+12 −12
Original line number Diff line number Diff line
@@ -4895,19 +4895,19 @@ xfs_bmap_del_extent_delay( 
		state |= BMAP_COWFORK;



	if (got->br_startoff == del->br_startoff)

		state |= BMAP_LEFT_CONTIG;

		state |= BMAP_LEFT_FILLING;

	if (got_endoff == del_endoff)

		state |= BMAP_RIGHT_CONTIG;

		state |= BMAP_RIGHT_FILLING;



	switch (state & (BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG)) {

	case BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG:

	switch (state & (BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING)) {

	case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING:

		/*

		 * Matches the whole extent.  Delete the entry.

		 */

		xfs_iext_remove(ip, *idx, 1, state);

		--*idx;

		break;

	case BMAP_LEFT_CONTIG:

	case BMAP_LEFT_FILLING:

		/*

		 * Deleting the first part of the extent.

		 */
@@ -4920,7 +4920,7 @@ xfs_bmap_del_extent_delay( 
		xfs_iext_update_extent(ifp, *idx, got);

		trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_);

		break;

	case BMAP_RIGHT_CONTIG:

	case BMAP_RIGHT_FILLING:

		/*

		 * Deleting the last part of the extent.

		 */
@@ -5005,19 +5005,19 @@ xfs_bmap_del_extent_cow( 
	ASSERT(!isnullstartblock(got->br_startblock));



	if (got->br_startoff == del->br_startoff)

		state |= BMAP_LEFT_CONTIG;

		state |= BMAP_LEFT_FILLING;

	if (got_endoff == del_endoff)

		state |= BMAP_RIGHT_CONTIG;

		state |= BMAP_RIGHT_FILLING;



	switch (state & (BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG)) {

	case BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG:

	switch (state & (BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING)) {

	case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING:

		/*

		 * Matches the whole extent.  Delete the entry.

		 */

		xfs_iext_remove(ip, *idx, 1, state);

		--*idx;

		break;

	case BMAP_LEFT_CONTIG:

	case BMAP_LEFT_FILLING:

		/*

		 * Deleting the first part of the extent.

		 */
@@ -5028,7 +5028,7 @@ xfs_bmap_del_extent_cow( 
		xfs_iext_update_extent(ifp, *idx, got);

		trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_);

		break;

	case BMAP_RIGHT_CONTIG:

	case BMAP_RIGHT_FILLING:

		/*

		 * Deleting the last part of the extent.

		 */