Commit f9e03706 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: kill the XFS_WANT_CORRUPT_* macros 



The XFS_WANT_CORRUPT_* macros conceal subtle side effects such as the
creation of local variables and redirections of the code flow.  This is
pretty ugly, so replace them with explicit XFS_IS_CORRUPT tests that
remove both of those ugly points.  The change was performed with the
following coccinelle script:

@@
expression mp, test;
identifier label;
@@

- XFS_WANT_CORRUPTED_GOTO(mp, test, label);
+ if (XFS_IS_CORRUPT(mp, !test)) { error = -EFSCORRUPTED; goto label; }

@@
expression mp, test;
@@

- XFS_WANT_CORRUPTED_RETURN(mp, test);
+ if (XFS_IS_CORRUPT(mp, !test)) return -EFSCORRUPTED;

@@
expression mp, lval, rval;
@@

- XFS_IS_CORRUPT(mp, !(lval == rval))
+ XFS_IS_CORRUPT(mp, lval != rval)

@@
expression mp, e1, e2;
@@

- XFS_IS_CORRUPT(mp, !(e1 && e2))
+ XFS_IS_CORRUPT(mp, !e1 || !e2)

@@
expression e1, e2;
@@

- !(e1 == e2)
+ e1 != e2

@@
expression e1, e2, e3, e4, e5, e6;
@@

- !(e1 == e2 && e3 == e4) || e5 != e6
+ e1 != e2 || e3 != e4 || e5 != e6

@@
expression e1, e2, e3, e4, e5, e6;
@@

- !(e1 == e2 || (e3 <= e4 && e5 <= e6))
+ e1 != e2 && (e3 > e4 || e5 > e6)

@@
expression mp, e1, e2;
@@

- XFS_IS_CORRUPT(mp, !(e1 <= e2))
+ XFS_IS_CORRUPT(mp, e1 > e2)

@@
expression mp, e1, e2;
@@

- XFS_IS_CORRUPT(mp, !(e1 < e2))
+ XFS_IS_CORRUPT(mp, e1 >= e2)

@@
expression mp, e1;
@@

- XFS_IS_CORRUPT(mp, !!e1)
+ XFS_IS_CORRUPT(mp, e1)

@@
expression mp, e1, e2;
@@

- XFS_IS_CORRUPT(mp, !(e1 || e2))
+ XFS_IS_CORRUPT(mp, !e1 && !e2)

@@
expression mp, e1, e2, e3, e4;
@@

- XFS_IS_CORRUPT(mp, !(e1 == e2) && !(e3 == e4))
+ XFS_IS_CORRUPT(mp, e1 != e2 && e3 != e4)

@@
expression mp, e1, e2, e3, e4;
@@

- XFS_IS_CORRUPT(mp, !(e1 <= e2) || !(e3 >= e4))
+ XFS_IS_CORRUPT(mp, e1 > e2 || e3 < e4)

@@
expression mp, e1, e2, e3, e4;
@@

- XFS_IS_CORRUPT(mp, !(e1 == e2) && !(e3 <= e4))
+ XFS_IS_CORRUPT(mp, e1 != e2 && e3 > e4)

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 1ec28615

fs/xfs/libxfs/xfs_alloc.c

+178 −62
Original line number Diff line number Diff line
@@ -451,13 +451,17 @@ xfs_alloc_fixup_trees( 
#ifdef DEBUG

		if ((error = xfs_alloc_get_rec(cnt_cur, &nfbno1, &nflen1, &i)))

			return error;

		XFS_WANT_CORRUPTED_RETURN(mp,

			i == 1 && nfbno1 == fbno && nflen1 == flen);

		if (XFS_IS_CORRUPT(mp,

				   i != 1 ||

				   nfbno1 != fbno ||

				   nflen1 != flen))

			return -EFSCORRUPTED;

#endif

	} else {

		if ((error = xfs_alloc_lookup_eq(cnt_cur, fbno, flen, &i)))

			return error;

		XFS_WANT_CORRUPTED_RETURN(mp, i == 1);

		if (XFS_IS_CORRUPT(mp, i != 1))

			return -EFSCORRUPTED;

	}

	/*

	 * Look up the record in the by-block tree if necessary.
@@ -466,13 +470,17 @@ xfs_alloc_fixup_trees( 
#ifdef DEBUG

		if ((error = xfs_alloc_get_rec(bno_cur, &nfbno1, &nflen1, &i)))

			return error;

		XFS_WANT_CORRUPTED_RETURN(mp,

			i == 1 && nfbno1 == fbno && nflen1 == flen);

		if (XFS_IS_CORRUPT(mp,

				   i != 1 ||

				   nfbno1 != fbno ||

				   nflen1 != flen))

			return -EFSCORRUPTED;

#endif

	} else {

		if ((error = xfs_alloc_lookup_eq(bno_cur, fbno, flen, &i)))

			return error;

		XFS_WANT_CORRUPTED_RETURN(mp, i == 1);

		if (XFS_IS_CORRUPT(mp, i != 1))

			return -EFSCORRUPTED;

	}



#ifdef DEBUG
@@ -483,8 +491,10 @@ xfs_alloc_fixup_trees( 
		bnoblock = XFS_BUF_TO_BLOCK(bno_cur->bc_bufs[0]);

		cntblock = XFS_BUF_TO_BLOCK(cnt_cur->bc_bufs[0]);



		XFS_WANT_CORRUPTED_RETURN(mp,

			bnoblock->bb_numrecs == cntblock->bb_numrecs);

		if (XFS_IS_CORRUPT(mp,

				   bnoblock->bb_numrecs !=

				   cntblock->bb_numrecs))

			return -EFSCORRUPTED;

	}

#endif
@@ -514,25 +524,30 @@ xfs_alloc_fixup_trees( 
	 */

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

		return error;

	XFS_WANT_CORRUPTED_RETURN(mp, i == 1);

	if (XFS_IS_CORRUPT(mp, i != 1))

		return -EFSCORRUPTED;

	/*

	 * Add new by-size btree entry(s).

	 */

	if (nfbno1 != NULLAGBLOCK) {

		if ((error = xfs_alloc_lookup_eq(cnt_cur, nfbno1, nflen1, &i)))

			return error;

		XFS_WANT_CORRUPTED_RETURN(mp, i == 0);

		if (XFS_IS_CORRUPT(mp, i != 0))

			return -EFSCORRUPTED;

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

			return error;

		XFS_WANT_CORRUPTED_RETURN(mp, i == 1);

		if (XFS_IS_CORRUPT(mp, i != 1))

			return -EFSCORRUPTED;

	}

	if (nfbno2 != NULLAGBLOCK) {

		if ((error = xfs_alloc_lookup_eq(cnt_cur, nfbno2, nflen2, &i)))

			return error;

		XFS_WANT_CORRUPTED_RETURN(mp, i == 0);

		if (XFS_IS_CORRUPT(mp, i != 0))

			return -EFSCORRUPTED;

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

			return error;

		XFS_WANT_CORRUPTED_RETURN(mp, i == 1);

		if (XFS_IS_CORRUPT(mp, i != 1))

			return -EFSCORRUPTED;

	}

	/*

	 * Fix up the by-block btree entry(s).
@@ -543,7 +558,8 @@ xfs_alloc_fixup_trees( 
		 */

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

			return error;

		XFS_WANT_CORRUPTED_RETURN(mp, i == 1);

		if (XFS_IS_CORRUPT(mp, i != 1))

			return -EFSCORRUPTED;

	} else {

		/*

		 * Update the by-block entry to start later|be shorter.
@@ -557,10 +573,12 @@ xfs_alloc_fixup_trees( 
		 */

		if ((error = xfs_alloc_lookup_eq(bno_cur, nfbno2, nflen2, &i)))

			return error;

		XFS_WANT_CORRUPTED_RETURN(mp, i == 0);

		if (XFS_IS_CORRUPT(mp, i != 0))

			return -EFSCORRUPTED;

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

			return error;

		XFS_WANT_CORRUPTED_RETURN(mp, i == 1);

		if (XFS_IS_CORRUPT(mp, i != 1))

			return -EFSCORRUPTED;

	}

	return 0;

}
@@ -821,7 +839,8 @@ xfs_alloc_cur_check( 
	error = xfs_alloc_get_rec(cur, &bno, &len, &i);

	if (error)

		return error;

	XFS_WANT_CORRUPTED_RETURN(args->mp, i == 1);

	if (XFS_IS_CORRUPT(args->mp, i != 1))

		return -EFSCORRUPTED;



	/*

	 * Check minlen and deactivate a cntbt cursor if out of acceptable size
@@ -1026,7 +1045,10 @@ xfs_alloc_ag_vextent_small( 
		error = xfs_alloc_get_rec(ccur, &fbno, &flen, &i);

		if (error)

			goto error;

		XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error);

		if (XFS_IS_CORRUPT(args->mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error;

		}

		goto out;

	}
@@ -1058,9 +1080,12 @@ xfs_alloc_ag_vextent_small( 
	}

	*fbnop = args->agbno = fbno;

	*flenp = args->len = 1;

	XFS_WANT_CORRUPTED_GOTO(args->mp,

		fbno < be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length),

		error);

	if (XFS_IS_CORRUPT(args->mp,

			   fbno >= be32_to_cpu(

				   XFS_BUF_TO_AGF(args->agbp)->agf_length))) {

		error = -EFSCORRUPTED;

		goto error;

	}

	args->wasfromfl = 1;

	trace_xfs_alloc_small_freelist(args);
@@ -1215,7 +1240,10 @@ xfs_alloc_ag_vextent_exact( 
	error = xfs_alloc_get_rec(bno_cur, &fbno, &flen, &i);

	if (error)

		goto error0;

	XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error0);

	if (XFS_IS_CORRUPT(args->mp, i != 1)) {

		error = -EFSCORRUPTED;

		goto error0;

	}

	ASSERT(fbno <= args->agbno);



	/*
@@ -1494,7 +1522,8 @@ xfs_alloc_ag_vextent_lastblock( 
			error = xfs_alloc_get_rec(acur->cnt, bno, len, &i);

			if (error)

				return error;

			XFS_WANT_CORRUPTED_RETURN(args->mp, i == 1);

			if (XFS_IS_CORRUPT(args->mp, i != 1))

				return -EFSCORRUPTED;

			if (*len >= args->minlen)

				break;

			error = xfs_btree_increment(acur->cnt, 0, &i);
@@ -1688,7 +1717,10 @@ restart: 
			error = xfs_alloc_get_rec(cnt_cur, &fbno, &flen, &i);

			if (error)

				goto error0;

			XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error0);

			if (XFS_IS_CORRUPT(args->mp, i != 1)) {

				error = -EFSCORRUPTED;

				goto error0;

			}



			busy = xfs_alloc_compute_aligned(args, fbno, flen,

					&rbno, &rlen, &busy_gen);
@@ -1722,8 +1754,13 @@ restart: 
	 * This can't happen in the second case above.

	 */

	rlen = XFS_EXTLEN_MIN(args->maxlen, rlen);

	XFS_WANT_CORRUPTED_GOTO(args->mp, rlen == 0 ||

			(rlen <= flen && rbno + rlen <= fbno + flen), error0);

	if (XFS_IS_CORRUPT(args->mp,

			   rlen != 0 &&

			   (rlen > flen ||

			    rbno + rlen > fbno + flen))) {

		error = -EFSCORRUPTED;

		goto error0;

	}

	if (rlen < args->maxlen) {

		xfs_agblock_t	bestfbno;

		xfs_extlen_t	bestflen;
@@ -1742,15 +1779,22 @@ restart: 
			if ((error = xfs_alloc_get_rec(cnt_cur, &fbno, &flen,

					&i)))

				goto error0;

			XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error0);

			if (XFS_IS_CORRUPT(args->mp, i != 1)) {

				error = -EFSCORRUPTED;

				goto error0;

			}

			if (flen < bestrlen)

				break;

			busy = xfs_alloc_compute_aligned(args, fbno, flen,

					&rbno, &rlen, &busy_gen);

			rlen = XFS_EXTLEN_MIN(args->maxlen, rlen);

			XFS_WANT_CORRUPTED_GOTO(args->mp, rlen == 0 ||

				(rlen <= flen && rbno + rlen <= fbno + flen),

				error0);

			if (XFS_IS_CORRUPT(args->mp,

					   rlen != 0 &&

					   (rlen > flen ||

					    rbno + rlen > fbno + flen))) {

				error = -EFSCORRUPTED;

				goto error0;

			}

			if (rlen > bestrlen) {

				bestrlen = rlen;

				bestrbno = rbno;
@@ -1763,7 +1807,10 @@ restart: 
		if ((error = xfs_alloc_lookup_eq(cnt_cur, bestfbno, bestflen,

				&i)))

			goto error0;

		XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error0);

		if (XFS_IS_CORRUPT(args->mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

		rlen = bestrlen;

		rbno = bestrbno;

		flen = bestflen;
@@ -1786,7 +1833,10 @@ restart: 
	xfs_alloc_fix_len(args);



	rlen = args->len;

	XFS_WANT_CORRUPTED_GOTO(args->mp, rlen <= flen, error0);

	if (XFS_IS_CORRUPT(args->mp, rlen > flen)) {

		error = -EFSCORRUPTED;

		goto error0;

	}

	/*

	 * Allocate and initialize a cursor for the by-block tree.

	 */
@@ -1800,10 +1850,13 @@ restart: 
	cnt_cur = bno_cur = NULL;

	args->len = rlen;

	args->agbno = rbno;

	XFS_WANT_CORRUPTED_GOTO(args->mp,

		args->agbno + args->len <=

			be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length),

		error0);

	if (XFS_IS_CORRUPT(args->mp,

			   args->agbno + args->len >

			   be32_to_cpu(

				   XFS_BUF_TO_AGF(args->agbp)->agf_length))) {

		error = -EFSCORRUPTED;

		goto error0;

	}

	trace_xfs_alloc_size_done(args);

	return 0;
@@ -1875,7 +1928,10 @@ xfs_free_ag_extent( 
		 */

		if ((error = xfs_alloc_get_rec(bno_cur, &ltbno, &ltlen, &i)))

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

		/*

		 * It's not contiguous, though.

		 */
@@ -1887,8 +1943,10 @@ xfs_free_ag_extent( 
			 * space was invalid, it's (partly) already free.

			 * Very bad.

			 */

			XFS_WANT_CORRUPTED_GOTO(mp,

						ltbno + ltlen <= bno, error0);

			if (XFS_IS_CORRUPT(mp, ltbno + ltlen > bno)) {

				error = -EFSCORRUPTED;

				goto error0;

			}

		}

	}

	/*
@@ -1903,7 +1961,10 @@ xfs_free_ag_extent( 
		 */

		if ((error = xfs_alloc_get_rec(bno_cur, &gtbno, &gtlen, &i)))

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

		/*

		 * It's not contiguous, though.

		 */
@@ -1915,7 +1976,10 @@ xfs_free_ag_extent( 
			 * space was invalid, it's (partly) already free.

			 * Very bad.

			 */

			XFS_WANT_CORRUPTED_GOTO(mp, gtbno >= bno + len, error0);

			if (XFS_IS_CORRUPT(mp, bno + len > gtbno)) {

				error = -EFSCORRUPTED;

				goto error0;

			}

		}

	}

	/*
@@ -1932,31 +1996,49 @@ xfs_free_ag_extent( 
		 */

		if ((error = xfs_alloc_lookup_eq(cnt_cur, ltbno, ltlen, &i)))

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

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

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

		/*

		 * Delete the old by-size entry on the right.

		 */

		if ((error = xfs_alloc_lookup_eq(cnt_cur, gtbno, gtlen, &i)))

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

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

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

		/*

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

		 */

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

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

		/*

		 * Move the by-block cursor back to the left neighbor.

		 */

		if ((error = xfs_btree_decrement(bno_cur, 0, &i)))

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

#ifdef DEBUG

		/*

		 * Check that this is the right record: delete didn't
@@ -1969,9 +2051,13 @@ xfs_free_ag_extent( 
			if ((error = xfs_alloc_get_rec(bno_cur, &xxbno, &xxlen,

					&i)))

				goto error0;

			XFS_WANT_CORRUPTED_GOTO(mp,

				i == 1 && xxbno == ltbno && xxlen == ltlen,

				error0);

			if (XFS_IS_CORRUPT(mp,

					   i != 1 ||

					   xxbno != ltbno ||

					   xxlen != ltlen)) {

				error = -EFSCORRUPTED;

				goto error0;

			}

		}

#endif

		/*
@@ -1992,17 +2078,26 @@ xfs_free_ag_extent( 
		 */

		if ((error = xfs_alloc_lookup_eq(cnt_cur, ltbno, ltlen, &i)))

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

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

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

		/*

		 * Back up the by-block cursor to the left neighbor, and

		 * update its length.

		 */

		if ((error = xfs_btree_decrement(bno_cur, 0, &i)))

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

		nbno = ltbno;

		nlen = len + ltlen;

		if ((error = xfs_alloc_update(bno_cur, nbno, nlen)))
@@ -2018,10 +2113,16 @@ xfs_free_ag_extent( 
		 */

		if ((error = xfs_alloc_lookup_eq(cnt_cur, gtbno, gtlen, &i)))

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

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

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

		/*

		 * Update the starting block and length of the right

		 * neighbor in the by-block tree.
@@ -2040,7 +2141,10 @@ xfs_free_ag_extent( 
		nlen = len;

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

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

	}

	xfs_btree_del_cursor(bno_cur, XFS_BTREE_NOERROR);

	bno_cur = NULL;
@@ -2049,10 +2153,16 @@ xfs_free_ag_extent( 
	 */

	if ((error = xfs_alloc_lookup_eq(cnt_cur, nbno, nlen, &i)))

		goto error0;

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

	if (XFS_IS_CORRUPT(mp, i != 0)) {

		error = -EFSCORRUPTED;

		goto error0;

	}

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

		goto error0;

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

	if (XFS_IS_CORRUPT(mp, i != 1)) {

		error = -EFSCORRUPTED;

		goto error0;

	}

	xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);

	cnt_cur = NULL;
@@ -3177,12 +3287,18 @@ __xfs_free_extent( 
	if (error)

		return error;



	XFS_WANT_CORRUPTED_GOTO(mp, agbno < mp->m_sb.sb_agblocks, err);

	if (XFS_IS_CORRUPT(mp, agbno >= mp->m_sb.sb_agblocks)) {

		error = -EFSCORRUPTED;

		goto err;

	}



	/* validate the extent size is legal now we have the agf locked */

	XFS_WANT_CORRUPTED_GOTO(mp,

		agbno + len <= be32_to_cpu(XFS_BUF_TO_AGF(agbp)->agf_length),

				err);

	if (XFS_IS_CORRUPT(mp,

			   agbno + len >

			   be32_to_cpu(XFS_BUF_TO_AGF(agbp)->agf_length))) {

		error = -EFSCORRUPTED;

		goto err;

	}



	error = xfs_free_ag_extent(tp, agbp, agno, agbno, len, oinfo, type);

	if (error)

fs/xfs/libxfs/xfs_bmap.c

+234 −65

File changed.

Preview size limit exceeded, changes collapsed.

fs/xfs/libxfs/xfs_btree.c

+42 −11
Original line number Diff line number Diff line
@@ -1971,7 +1971,8 @@ xfs_btree_lookup( 
			error = xfs_btree_increment(cur, 0, &i);

			if (error)

				goto error0;

			XFS_WANT_CORRUPTED_RETURN(cur->bc_mp, i == 1);

			if (XFS_IS_CORRUPT(cur->bc_mp, i != 1))

				return -EFSCORRUPTED;

			*stat = 1;

			return 0;

		}
@@ -2426,7 +2427,10 @@ xfs_btree_lshift( 
		if (error)

			goto error0;

		i = xfs_btree_firstrec(tcur, level);

		XFS_WANT_CORRUPTED_GOTO(tcur->bc_mp, i == 1, error0);

		if (XFS_IS_CORRUPT(tcur->bc_mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}



		error = xfs_btree_decrement(tcur, level, &i);

		if (error)
@@ -2593,7 +2597,10 @@ xfs_btree_rshift( 
	if (error)

		goto error0;

	i = xfs_btree_lastrec(tcur, level);

	XFS_WANT_CORRUPTED_GOTO(tcur->bc_mp, i == 1, error0);

	if (XFS_IS_CORRUPT(tcur->bc_mp, i != 1)) {

		error = -EFSCORRUPTED;

		goto error0;

	}



	error = xfs_btree_increment(tcur, level, &i);

	if (error)
@@ -3447,7 +3454,10 @@ xfs_btree_insert( 
			goto error0;

		}



		XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0);

		if (XFS_IS_CORRUPT(cur->bc_mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

		level++;



		/*
@@ -3851,15 +3861,24 @@ xfs_btree_delrec( 
		 * Actually any entry but the first would suffice.

		 */

		i = xfs_btree_lastrec(tcur, level);

		XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0);

		if (XFS_IS_CORRUPT(cur->bc_mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}



		error = xfs_btree_increment(tcur, level, &i);

		if (error)

			goto error0;

		XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0);

		if (XFS_IS_CORRUPT(cur->bc_mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}



		i = xfs_btree_lastrec(tcur, level);

		XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0);

		if (XFS_IS_CORRUPT(cur->bc_mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}



		/* Grab a pointer to the block. */

		right = xfs_btree_get_block(tcur, level, &rbp);
@@ -3903,12 +3922,18 @@ xfs_btree_delrec( 
		rrecs = xfs_btree_get_numrecs(right);

		if (!xfs_btree_ptr_is_null(cur, &lptr)) {

			i = xfs_btree_firstrec(tcur, level);

			XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0);

			if (XFS_IS_CORRUPT(cur->bc_mp, i != 1)) {

				error = -EFSCORRUPTED;

				goto error0;

			}



			error = xfs_btree_decrement(tcur, level, &i);

			if (error)

				goto error0;

			XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0);

			if (XFS_IS_CORRUPT(cur->bc_mp, i != 1)) {

				error = -EFSCORRUPTED;

				goto error0;

			}

		}

	}
@@ -3922,13 +3947,19 @@ xfs_btree_delrec( 
		 * previous block.

		 */

		i = xfs_btree_firstrec(tcur, level);

		XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0);

		if (XFS_IS_CORRUPT(cur->bc_mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}



		error = xfs_btree_decrement(tcur, level, &i);

		if (error)

			goto error0;

		i = xfs_btree_firstrec(tcur, level);

		XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0);

		if (XFS_IS_CORRUPT(cur->bc_mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}



		/* Grab a pointer to the block. */

		left = xfs_btree_get_block(tcur, level, &lbp);

fs/xfs/libxfs/xfs_ialloc.c

+86 −31
Original line number Diff line number Diff line
@@ -544,7 +544,10 @@ xfs_inobt_insert_sprec( 
					     nrec->ir_free, &i);

		if (error)

			goto error;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error;

		}



		goto out;

	}
@@ -557,17 +560,23 @@ xfs_inobt_insert_sprec( 
		error = xfs_inobt_get_rec(cur, &rec, &i);

		if (error)

			goto error;

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

		XFS_WANT_CORRUPTED_GOTO(mp,

					rec.ir_startino == nrec->ir_startino,

					error);

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error;

		}

		if (XFS_IS_CORRUPT(mp, rec.ir_startino != nrec->ir_startino)) {

			error = -EFSCORRUPTED;

			goto error;

		}



		/*

		 * This should never fail. If we have coexisting records that

		 * cannot merge, something is seriously wrong.

		 */

		XFS_WANT_CORRUPTED_GOTO(mp, __xfs_inobt_can_merge(nrec, &rec),

					error);

		if (XFS_IS_CORRUPT(mp, !__xfs_inobt_can_merge(nrec, &rec))) {

			error = -EFSCORRUPTED;

			goto error;

		}



		trace_xfs_irec_merge_pre(mp, agno, rec.ir_startino,

					 rec.ir_holemask, nrec->ir_startino,
@@ -1057,7 +1066,8 @@ xfs_ialloc_next_rec( 
		error = xfs_inobt_get_rec(cur, rec, &i);

		if (error)

			return error;

		XFS_WANT_CORRUPTED_RETURN(cur->bc_mp, i == 1);

		if (XFS_IS_CORRUPT(cur->bc_mp, i != 1))

			return -EFSCORRUPTED;

	}



	return 0;
@@ -1081,7 +1091,8 @@ xfs_ialloc_get_rec( 
		error = xfs_inobt_get_rec(cur, rec, &i);

		if (error)

			return error;

		XFS_WANT_CORRUPTED_RETURN(cur->bc_mp, i == 1);

		if (XFS_IS_CORRUPT(cur->bc_mp, i != 1))

			return -EFSCORRUPTED;

	}



	return 0;
@@ -1161,12 +1172,18 @@ xfs_dialloc_ag_inobt( 
		error = xfs_inobt_lookup(cur, pagino, XFS_LOOKUP_LE, &i);

		if (error)

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}



		error = xfs_inobt_get_rec(cur, &rec, &j);

		if (error)

			goto error0;

		XFS_WANT_CORRUPTED_GOTO(mp, j == 1, error0);

		if (XFS_IS_CORRUPT(mp, j != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}



		if (rec.ir_freecount > 0) {

			/*
@@ -1321,19 +1338,28 @@ xfs_dialloc_ag_inobt( 
	error = xfs_inobt_lookup(cur, 0, XFS_LOOKUP_GE, &i);

	if (error)

		goto error0;

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

	if (XFS_IS_CORRUPT(mp, i != 1)) {

		error = -EFSCORRUPTED;

		goto error0;

	}



	for (;;) {

		error = xfs_inobt_get_rec(cur, &rec, &i);

		if (error)

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

		if (rec.ir_freecount > 0)

			break;

		error = xfs_btree_increment(cur, 0, &i);

		if (error)

			goto error0;

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

		if (XFS_IS_CORRUPT(mp, i != 1)) {

			error = -EFSCORRUPTED;

			goto error0;

		}

	}



alloc_inode:
@@ -1393,7 +1419,8 @@ xfs_dialloc_ag_finobt_near( 
		error = xfs_inobt_get_rec(lcur, rec, &i);

		if (error)

			return error;

		XFS_WANT_CORRUPTED_RETURN(lcur->bc_mp, i == 1);

		if (XFS_IS_CORRUPT(lcur->bc_mp, i != 1))

			return -EFSCORRUPTED;



		/*

		 * See if we've landed in the parent inode record. The finobt
@@ -1416,10 +1443,16 @@ xfs_dialloc_ag_finobt_near( 
		error = xfs_inobt_get_rec(rcur, &rrec, &j);

		if (error)

			goto error_rcur;

		XFS_WANT_CORRUPTED_GOTO(lcur->bc_mp, j == 1, error_rcur);

		if (XFS_IS_CORRUPT(lcur->bc_mp, j != 1)) {

			error = -EFSCORRUPTED;

			goto error_rcur;

		}

	}



	XFS_WANT_CORRUPTED_GOTO(lcur->bc_mp, i == 1 || j == 1, error_rcur);

	if (XFS_IS_CORRUPT(lcur->bc_mp, i != 1 && j != 1)) {

		error = -EFSCORRUPTED;

		goto error_rcur;

	}

	if (i == 1 && j == 1) {

		/*

		 * Both the left and right records are valid. Choose the closer
@@ -1472,7 +1505,8 @@ xfs_dialloc_ag_finobt_newino( 
			error = xfs_inobt_get_rec(cur, rec, &i);

			if (error)

				return error;

			XFS_WANT_CORRUPTED_RETURN(cur->bc_mp, i == 1);

			if (XFS_IS_CORRUPT(cur->bc_mp, i != 1))

				return -EFSCORRUPTED;

			return 0;

		}

	}
@@ -1483,12 +1517,14 @@ xfs_dialloc_ag_finobt_newino( 
	error = xfs_inobt_lookup(cur, 0, XFS_LOOKUP_GE, &i);

	if (error)

		return error;

	XFS_WANT_CORRUPTED_RETURN(cur->bc_mp, i == 1);

	if (XFS_IS_CORRUPT(cur->bc_mp, i != 1))

		return -EFSCORRUPTED;



	error = xfs_inobt_get_rec(cur, rec, &i);

	if (error)

		return error;

	XFS_WANT_CORRUPTED_RETURN(cur->bc_mp, i == 1);

	if (XFS_IS_CORRUPT(cur->bc_mp, i != 1))

		return -EFSCORRUPTED;



	return 0;

}
@@ -1510,20 +1546,24 @@ xfs_dialloc_ag_update_inobt( 
	error = xfs_inobt_lookup(cur, frec->ir_startino, XFS_LOOKUP_EQ, &i);

	if (error)

		return error;

	XFS_WANT_CORRUPTED_RETURN(cur->bc_mp, i == 1);

	if (XFS_IS_CORRUPT(cur->bc_mp, i != 1))

		return -EFSCORRUPTED;



	error = xfs_inobt_get_rec(cur, &rec, &i);

	if (error)

		return error;

	XFS_WANT_CORRUPTED_RETURN(cur->bc_mp, i == 1);

	if (XFS_IS_CORRUPT(cur->bc_mp, i != 1))

		return -EFSCORRUPTED;

	ASSERT((XFS_AGINO_TO_OFFSET(cur->bc_mp, rec.ir_startino) %

				   XFS_INODES_PER_CHUNK) == 0);



	rec.ir_free &= ~XFS_INOBT_MASK(offset);

	rec.ir_freecount--;



	XFS_WANT_CORRUPTED_RETURN(cur->bc_mp, (rec.ir_free == frec->ir_free) &&

				  (rec.ir_freecount == frec->ir_freecount));

	if (XFS_IS_CORRUPT(cur->bc_mp,

			   rec.ir_free != frec->ir_free ||

			   rec.ir_freecount != frec->ir_freecount))

		return -EFSCORRUPTED;



	return xfs_inobt_update(cur, &rec);

}
@@ -1933,14 +1973,20 @@ xfs_difree_inobt( 
			__func__, error);

		goto error0;

	}

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

	if (XFS_IS_CORRUPT(mp, i != 1)) {

		error = -EFSCORRUPTED;

		goto error0;

	}

	error = xfs_inobt_get_rec(cur, &rec, &i);

	if (error) {

		xfs_warn(mp, "%s: xfs_inobt_get_rec() returned error %d.",

			__func__, error);

		goto error0;

	}

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

	if (XFS_IS_CORRUPT(mp, i != 1)) {

		error = -EFSCORRUPTED;

		goto error0;

	}

	/*

	 * Get the offset in the inode chunk.

	 */
@@ -2052,7 +2098,10 @@ xfs_difree_finobt( 
		 * freed an inode in a previously fully allocated chunk. If not,

		 * something is out of sync.

		 */

		XFS_WANT_CORRUPTED_GOTO(mp, ibtrec->ir_freecount == 1, error);

		if (XFS_IS_CORRUPT(mp, ibtrec->ir_freecount != 1)) {

			error = -EFSCORRUPTED;

			goto error;

		}



		error = xfs_inobt_insert_rec(cur, ibtrec->ir_holemask,

					     ibtrec->ir_count,
@@ -2075,14 +2124,20 @@ xfs_difree_finobt( 
	error = xfs_inobt_get_rec(cur, &rec, &i);

	if (error)

		goto error;

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

	if (XFS_IS_CORRUPT(mp, i != 1)) {

		error = -EFSCORRUPTED;

		goto error;

	}



	rec.ir_free |= XFS_INOBT_MASK(offset);

	rec.ir_freecount++;



	XFS_WANT_CORRUPTED_GOTO(mp, (rec.ir_free == ibtrec->ir_free) &&

				(rec.ir_freecount == ibtrec->ir_freecount),

				error);

	if (XFS_IS_CORRUPT(mp,

			   rec.ir_free != ibtrec->ir_free ||

			   rec.ir_freecount != ibtrec->ir_freecount)) {

		error = -EFSCORRUPTED;

		goto error;

	}



	/*

	 * The content of inobt records should always match between the inobt

fs/xfs/libxfs/xfs_refcount.c

+122 −45

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE