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

Commit 024adf48 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Dave Chinner
Browse files

xfs: reduce stack usage of _reflink_clear_inode_flag 



The loop in _reflink_clear_inode_flag isn't necessary since we
jump out if any part of any extent is shared.  Remove the loop
and we no longer need two maps, so we can save some stack use.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reported-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 63646fc5

fs/xfs/xfs_reflink.c

+16 −24
Original line number Diff line number Diff line
@@ -1507,7 +1507,7 @@ xfs_reflink_clear_inode_flag( 
	xfs_extlen_t		aglen;

	xfs_agblock_t		rbno;

	xfs_extlen_t		rlen;

	struct xfs_bmbt_irec	map[2];

	struct xfs_bmbt_irec	map;

	int			nmaps;

	int			error = 0;
@@ -1521,21 +1521,19 @@ xfs_reflink_clear_inode_flag( 
		 * Look for extents in the file.  Skip holes, delalloc, or

		 * unwritten extents; they can't be reflinked.

		 */

		error = xfs_bmapi_read(ip, fbno, end - fbno, map, &nmaps, 0);

		error = xfs_bmapi_read(ip, fbno, end - fbno, &map, &nmaps, 0);

		if (error)

			return error;

		if (nmaps == 0)

			break;

		if (map[0].br_startblock == HOLESTARTBLOCK ||

		    map[0].br_startblock == DELAYSTARTBLOCK ||

		    ISUNWRITTEN(&map[0]))

		if (map.br_startblock == HOLESTARTBLOCK ||

		    map.br_startblock == DELAYSTARTBLOCK ||

		    ISUNWRITTEN(&map))

			goto next;



		map[1] = map[0];

		while (map[1].br_blockcount) {

			agno = XFS_FSB_TO_AGNO(mp, map[1].br_startblock);

			agbno = XFS_FSB_TO_AGBNO(mp, map[1].br_startblock);

			aglen = map[1].br_blockcount;

		agno = XFS_FSB_TO_AGNO(mp, map.br_startblock);

		agbno = XFS_FSB_TO_AGBNO(mp, map.br_startblock);

		aglen = map.br_blockcount;



		error = xfs_reflink_find_shared(mp, agno, agbno, aglen,

				&rbno, &rlen, false);
@@ -1544,14 +1542,8 @@ xfs_reflink_clear_inode_flag( 
		/* Is there still a shared block here? */

		if (rbno != NULLAGBLOCK)

			return 0;



			map[1].br_blockcount -= aglen;

			map[1].br_startoff += aglen;

			map[1].br_startblock += aglen;

		}



next:

		fbno = map[0].br_startoff + map[0].br_blockcount;

		fbno = map.br_startoff + map.br_blockcount;

	}



	/*