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

Commit 91cca5df authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Lachlan McIlroy
Browse files

[XFS] implement generic xfs_btree_delete/delrec 



Make the btree delete code generic. Based on a patch from David Chinner
with lots of changes to follow the original btree implementations more
closely. While this loses some of the generic helper routines for
inserting/moving/removing records it also solves some of the one off bugs
in the original code and makes it easier to verify.

SGI-PV: 985583

SGI-Modid: xfs-linux-melb:xfs-kern:32205a

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarBill O'Donnell <billodo@sgi.com>
Signed-off-by: default avatarDavid Chinner <david@fromorbit.com>
parent d4b3a4b7

fs/xfs/xfs_alloc.c

+7 −7
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ xfs_alloc_fixup_trees( 
	/*

	 * Delete the entry from the by-size btree.

	 */

	if ((error = xfs_alloc_delete(cnt_cur, &i)))

	if ((error = xfs_btree_delete(cnt_cur, &i)))

		return error;

	XFS_WANT_CORRUPTED_RETURN(i == 1);

	/*
@@ -427,7 +427,7 @@ xfs_alloc_fixup_trees( 
		/*

		 * No remaining freespace, just delete the by-block tree entry.

		 */

		if ((error = xfs_alloc_delete(bno_cur, &i)))

		if ((error = xfs_btree_delete(bno_cur, &i)))

			return error;

		XFS_WANT_CORRUPTED_RETURN(i == 1);

	} else {
@@ -1651,7 +1651,7 @@ xfs_free_ag_extent( 
		if ((error = xfs_alloc_lookup_eq(cnt_cur, ltbno, ltlen, &i)))

			goto error0;

		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);

		if ((error = xfs_alloc_delete(cnt_cur, &i)))

		if ((error = xfs_btree_delete(cnt_cur, &i)))

			goto error0;

		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);

		/*
@@ -1660,13 +1660,13 @@ xfs_free_ag_extent( 
		if ((error = xfs_alloc_lookup_eq(cnt_cur, gtbno, gtlen, &i)))

			goto error0;

		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);

		if ((error = xfs_alloc_delete(cnt_cur, &i)))

		if ((error = xfs_btree_delete(cnt_cur, &i)))

			goto error0;

		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);

		/*

		 * Delete the old by-block entry for the right block.

		 */

		if ((error = xfs_alloc_delete(bno_cur, &i)))

		if ((error = xfs_btree_delete(bno_cur, &i)))

			goto error0;

		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);

		/*
@@ -1711,7 +1711,7 @@ xfs_free_ag_extent( 
		if ((error = xfs_alloc_lookup_eq(cnt_cur, ltbno, ltlen, &i)))

			goto error0;

		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);

		if ((error = xfs_alloc_delete(cnt_cur, &i)))

		if ((error = xfs_btree_delete(cnt_cur, &i)))

			goto error0;

		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);

		/*
@@ -1737,7 +1737,7 @@ xfs_free_ag_extent( 
		if ((error = xfs_alloc_lookup_eq(cnt_cur, gtbno, gtlen, &i)))

			goto error0;

		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);

		if ((error = xfs_alloc_delete(cnt_cur, &i)))

		if ((error = xfs_btree_delete(cnt_cur, &i)))

			goto error0;

		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);

		/*

fs/xfs/xfs_alloc_btree.c

+59 −685

File changed.

Preview size limit exceeded, changes collapsed.

fs/xfs/xfs_alloc_btree.h

+0 −7

File changed.

Preview size limit exceeded, changes collapsed.

fs/xfs/xfs_bmap.c

+7 −7

File changed.

Preview size limit exceeded, changes collapsed.

fs/xfs/xfs_bmap_btree.c

+9 −516

File changed.

Preview size limit exceeded, changes collapsed.