Merge branch 'xfs-misc-fixes-for-4.1' into for-next (3cabb836) · Commits · git / linux-nf

Documentation/filesystems/xfs.txt

+9 −20

Original line number	Diff line number	Diff line
		@@ -228,30 +228,19 @@ default behaviour.
		Deprecated Mount Options
		========================

		delaylog/nodelaylog
		Delayed logging is the only logging method that XFS supports
		now, so these mount options are now ignored.

		Due for removal in 3.12.

		ihashsize=value
		In memory inode hashes have been removed, so this option has
		no function as of August 2007. Option is deprecated.

		Due for removal in 3.12.
		None at present.

		irixsgid
		This behaviour is now controlled by a sysctl, so the mount
		option is ignored.

		Due for removal in 3.12.
		Removed Mount Options
		=====================

		osyncisdsync
		osyncisosync
		O_SYNC and O_DSYNC are fully supported, so there is no need
		for these options any more.
		Name Removed
		---- -------
		delaylog/nodelaylog v3.20
		ihashsize v3.20
		irixsgid v3.20
		osyncisdsync/osyncisosync v3.20

		Due for removal in 3.12.

		sysctls
		=======

fs/xfs/libxfs/xfs_alloc.c

+55 −49

Original line number	Diff line number	Diff line
		@@ -260,6 +260,7 @@ xfs_alloc_fix_len(
		rlen = rlen - (k - args->mod);
		else
		rlen = rlen - args->prod + (args->mod - k);
		/* casts to (int) catch length underflows */
		if ((int)rlen < (int)args->minlen)
		return;
		ASSERT(rlen >= args->minlen && rlen <= args->maxlen);
		@@ -286,7 +287,8 @@ xfs_alloc_fix_minleft(
		if (diff >= 0)
		return 1;
		args->len += diff; /* shrink the allocated space */
		if (args->len >= args->minlen)
		/* casts to (int) catch length underflows */
		if ((int)args->len >= (int)args->minlen)
		return 1;
		args->agbno = NULLAGBLOCK;
		return 0;
		@@ -315,6 +317,9 @@ xfs_alloc_fixup_trees(
		xfs_agblock_t nfbno2; /* second new free startblock */
		xfs_extlen_t nflen1=0; /* first new free length */
		xfs_extlen_t nflen2=0; /* second new free length */
		struct xfs_mount *mp;

		mp = cnt_cur->bc_mp;

		/*
		* Look up the record in the by-size tree if necessary.
		@@ -323,13 +328,13 @@ xfs_alloc_fixup_trees(
		#ifdef DEBUG
		if ((error = xfs_alloc_get_rec(cnt_cur, &nfbno1, &nflen1, &i)))
		return error;
		XFS_WANT_CORRUPTED_RETURN(
		XFS_WANT_CORRUPTED_RETURN(mp,
		i == 1 && nfbno1 == fbno && nflen1 == flen);
		#endif
		} else {
		if ((error = xfs_alloc_lookup_eq(cnt_cur, fbno, flen, &i)))
		return error;
		XFS_WANT_CORRUPTED_RETURN(i == 1);
		XFS_WANT_CORRUPTED_RETURN(mp, i == 1);
		}
		/*
		* Look up the record in the by-block tree if necessary.
		@@ -338,13 +343,13 @@ xfs_alloc_fixup_trees(
		#ifdef DEBUG
		if ((error = xfs_alloc_get_rec(bno_cur, &nfbno1, &nflen1, &i)))
		return error;
		XFS_WANT_CORRUPTED_RETURN(
		XFS_WANT_CORRUPTED_RETURN(mp,
		i == 1 && nfbno1 == fbno && nflen1 == flen);
		#endif
		} else {
		if ((error = xfs_alloc_lookup_eq(bno_cur, fbno, flen, &i)))
		return error;
		XFS_WANT_CORRUPTED_RETURN(i == 1);
		XFS_WANT_CORRUPTED_RETURN(mp, i == 1);
		}

		#ifdef DEBUG
		@@ -355,7 +360,7 @@ 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(
		XFS_WANT_CORRUPTED_RETURN(mp,
		bnoblock->bb_numrecs == cntblock->bb_numrecs);
		}
		#endif
		@@ -386,25 +391,25 @@ xfs_alloc_fixup_trees(
		*/
		if ((error = xfs_btree_delete(cnt_cur, &i)))
		return error;
		XFS_WANT_CORRUPTED_RETURN(i == 1);
		XFS_WANT_CORRUPTED_RETURN(mp, i == 1);
		/*
		* 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(i == 0);
		XFS_WANT_CORRUPTED_RETURN(mp, i == 0);
		if ((error = xfs_btree_insert(cnt_cur, &i)))
		return error;
		XFS_WANT_CORRUPTED_RETURN(i == 1);
		XFS_WANT_CORRUPTED_RETURN(mp, i == 1);
		}
		if (nfbno2 != NULLAGBLOCK) {
		if ((error = xfs_alloc_lookup_eq(cnt_cur, nfbno2, nflen2, &i)))
		return error;
		XFS_WANT_CORRUPTED_RETURN(i == 0);
		XFS_WANT_CORRUPTED_RETURN(mp, i == 0);
		if ((error = xfs_btree_insert(cnt_cur, &i)))
		return error;
		XFS_WANT_CORRUPTED_RETURN(i == 1);
		XFS_WANT_CORRUPTED_RETURN(mp, i == 1);
		}
		/*
		* Fix up the by-block btree entry(s).
		@@ -415,7 +420,7 @@ xfs_alloc_fixup_trees(
		*/
		if ((error = xfs_btree_delete(bno_cur, &i)))
		return error;
		XFS_WANT_CORRUPTED_RETURN(i == 1);
		XFS_WANT_CORRUPTED_RETURN(mp, i == 1);
		} else {
		/*
		* Update the by-block entry to start later\|be shorter.
		@@ -429,10 +434,10 @@ xfs_alloc_fixup_trees(
		*/
		if ((error = xfs_alloc_lookup_eq(bno_cur, nfbno2, nflen2, &i)))
		return error;
		XFS_WANT_CORRUPTED_RETURN(i == 0);
		XFS_WANT_CORRUPTED_RETURN(mp, i == 0);
		if ((error = xfs_btree_insert(bno_cur, &i)))
		return error;
		XFS_WANT_CORRUPTED_RETURN(i == 1);
		XFS_WANT_CORRUPTED_RETURN(mp, i == 1);
		}
		return 0;
		}
		@@ -682,7 +687,7 @@ xfs_alloc_ag_vextent_exact(
		error = xfs_alloc_get_rec(bno_cur, &fbno, &flen, &i);
		if (error)
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error0);
		ASSERT(fbno <= args->agbno);

		/*
		@@ -783,7 +788,7 @@ xfs_alloc_find_best_extent(
		error = xfs_alloc_get_rec(*scur, sbno, slen, &i);
		if (error)
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error0);
		xfs_alloc_compute_aligned(args, sbno, slen, sbnoa, slena);

		/*
		@@ -946,7 +951,7 @@ xfs_alloc_ag_vextent_near(
		if ((error = xfs_alloc_get_rec(cnt_cur, &ltbno,
		&ltlen, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error0);
		if (ltlen >= args->minlen)
		break;
		if ((error = xfs_btree_increment(cnt_cur, 0, &i)))
		@@ -966,7 +971,7 @@ xfs_alloc_ag_vextent_near(
		*/
		if ((error = xfs_alloc_get_rec(cnt_cur, &ltbno, &ltlen, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error0);
		xfs_alloc_compute_aligned(args, ltbno, ltlen,
		&ltbnoa, &ltlena);
		if (ltlena < args->minlen)
		@@ -999,7 +1004,7 @@ xfs_alloc_ag_vextent_near(
		cnt_cur->bc_ptrs[0] = besti;
		if ((error = xfs_alloc_get_rec(cnt_cur, &ltbno, &ltlen, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error0);
		ASSERT(ltbno + ltlen <= be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));
		args->len = blen;
		if (!xfs_alloc_fix_minleft(args)) {
		@@ -1088,7 +1093,7 @@ xfs_alloc_ag_vextent_near(
		if (bno_cur_lt) {
		if ((error = xfs_alloc_get_rec(bno_cur_lt, &ltbno, &ltlen, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error0);
		xfs_alloc_compute_aligned(args, ltbno, ltlen,
		&ltbnoa, &ltlena);
		if (ltlena >= args->minlen)
		@@ -1104,7 +1109,7 @@ xfs_alloc_ag_vextent_near(
		if (bno_cur_gt) {
		if ((error = xfs_alloc_get_rec(bno_cur_gt, &gtbno, &gtlen, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error0);
		xfs_alloc_compute_aligned(args, gtbno, gtlen,
		&gtbnoa, &gtlena);
		if (gtlena >= args->minlen)
		@@ -1303,7 +1308,7 @@ xfs_alloc_ag_vextent_size(
		error = xfs_alloc_get_rec(cnt_cur, &fbno, &flen, &i);
		if (error)
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error0);

		xfs_alloc_compute_aligned(args, fbno, flen,
		&rbno, &rlen);
		@@ -1342,7 +1347,7 @@ xfs_alloc_ag_vextent_size(
		* This can't happen in the second case above.
		*/
		rlen = XFS_EXTLEN_MIN(args->maxlen, rlen);
		XFS_WANT_CORRUPTED_GOTO(rlen == 0 \|\|
		XFS_WANT_CORRUPTED_GOTO(args->mp, rlen == 0 \|\|
		(rlen <= flen && rbno + rlen <= fbno + flen), error0);
		if (rlen < args->maxlen) {
		xfs_agblock_t bestfbno;
		@@ -1362,13 +1367,13 @@ xfs_alloc_ag_vextent_size(
		if ((error = xfs_alloc_get_rec(cnt_cur, &fbno, &flen,
		&i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error0);
		if (flen < bestrlen)
		break;
		xfs_alloc_compute_aligned(args, fbno, flen,
		&rbno, &rlen);
		rlen = XFS_EXTLEN_MIN(args->maxlen, rlen);
		XFS_WANT_CORRUPTED_GOTO(rlen == 0 \|\|
		XFS_WANT_CORRUPTED_GOTO(args->mp, rlen == 0 \|\|
		(rlen <= flen && rbno + rlen <= fbno + flen),
		error0);
		if (rlen > bestrlen) {
		@@ -1383,7 +1388,7 @@ xfs_alloc_ag_vextent_size(
		if ((error = xfs_alloc_lookup_eq(cnt_cur, bestfbno, bestflen,
		&i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error0);
		rlen = bestrlen;
		rbno = bestrbno;
		flen = bestflen;
		@@ -1408,7 +1413,7 @@ xfs_alloc_ag_vextent_size(
		if (!xfs_alloc_fix_minleft(args))
		goto out_nominleft;
		rlen = args->len;
		XFS_WANT_CORRUPTED_GOTO(rlen <= flen, error0);
		XFS_WANT_CORRUPTED_GOTO(args->mp, rlen <= flen, error0);
		/*
		* Allocate and initialize a cursor for the by-block tree.
		*/
		@@ -1422,7 +1427,7 @@ xfs_alloc_ag_vextent_size(
		cnt_cur = bno_cur = NULL;
		args->len = rlen;
		args->agbno = rbno;
		XFS_WANT_CORRUPTED_GOTO(
		XFS_WANT_CORRUPTED_GOTO(args->mp,
		args->agbno + args->len <=
		be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length),
		error0);
		@@ -1467,7 +1472,7 @@ xfs_alloc_ag_vextent_small(
		if (i) {
		if ((error = xfs_alloc_get_rec(ccur, &fbno, &flen, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(args->mp, i == 1, error0);
		}
		/*
		* Nothing in the btree, try the freelist. Make sure
		@@ -1493,7 +1498,7 @@ xfs_alloc_ag_vextent_small(
		}
		args->len = 1;
		args->agbno = fbno;
		XFS_WANT_CORRUPTED_GOTO(
		XFS_WANT_CORRUPTED_GOTO(args->mp,
		args->agbno + args->len <=
		be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length),
		error0);
		@@ -1579,7 +1584,7 @@ xfs_free_ag_extent(
		*/
		if ((error = xfs_alloc_get_rec(bno_cur, &ltbno, &ltlen, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, error0);
		/*
		* It's not contiguous, though.
		*/
		@@ -1591,7 +1596,8 @@ xfs_free_ag_extent(
		* space was invalid, it's (partly) already free.
		* Very bad.
		*/
		XFS_WANT_CORRUPTED_GOTO(ltbno + ltlen <= bno, error0);
		XFS_WANT_CORRUPTED_GOTO(mp,
		ltbno + ltlen <= bno, error0);
		}
		}
		/*
		@@ -1606,7 +1612,7 @@ xfs_free_ag_extent(
		*/
		if ((error = xfs_alloc_get_rec(bno_cur, &gtbno, &gtlen, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, error0);
		/*
		* It's not contiguous, though.
		*/
		@@ -1618,7 +1624,7 @@ xfs_free_ag_extent(
		* space was invalid, it's (partly) already free.
		* Very bad.
		*/
		XFS_WANT_CORRUPTED_GOTO(gtbno >= bno + len, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, gtbno >= bno + len, error0);
		}
		}
		/*
		@@ -1635,31 +1641,31 @@ xfs_free_ag_extent(
		*/
		if ((error = xfs_alloc_lookup_eq(cnt_cur, ltbno, ltlen, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, error0);
		if ((error = xfs_btree_delete(cnt_cur, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, 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(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, error0);
		if ((error = xfs_btree_delete(cnt_cur, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, 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(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, 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(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, error0);
		#ifdef DEBUG
		/*
		* Check that this is the right record: delete didn't
		@@ -1672,7 +1678,7 @@ xfs_free_ag_extent(
		if ((error = xfs_alloc_get_rec(bno_cur, &xxbno, &xxlen,
		&i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(
		XFS_WANT_CORRUPTED_GOTO(mp,
		i == 1 && xxbno == ltbno && xxlen == ltlen,
		error0);
		}
		@@ -1695,17 +1701,17 @@ xfs_free_ag_extent(
		*/
		if ((error = xfs_alloc_lookup_eq(cnt_cur, ltbno, ltlen, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, error0);
		if ((error = xfs_btree_delete(cnt_cur, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, 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(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, error0);
		nbno = ltbno;
		nlen = len + ltlen;
		if ((error = xfs_alloc_update(bno_cur, nbno, nlen)))
		@@ -1721,10 +1727,10 @@ xfs_free_ag_extent(
		*/
		if ((error = xfs_alloc_lookup_eq(cnt_cur, gtbno, gtlen, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, error0);
		if ((error = xfs_btree_delete(cnt_cur, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, error0);
		/*
		* Update the starting block and length of the right
		* neighbor in the by-block tree.
		@@ -1743,7 +1749,7 @@ xfs_free_ag_extent(
		nlen = len;
		if ((error = xfs_btree_insert(bno_cur, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, error0);
		}
		xfs_btree_del_cursor(bno_cur, XFS_BTREE_NOERROR);
		bno_cur = NULL;
		@@ -1752,10 +1758,10 @@ xfs_free_ag_extent(
		*/
		if ((error = xfs_alloc_lookup_eq(cnt_cur, nbno, nlen, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 0, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 0, error0);
		if ((error = xfs_btree_insert(cnt_cur, &i)))
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, error0);
		xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
		cnt_cur = NULL;

fs/xfs/libxfs/xfs_bmap.c

+72 −62

File changed.

Preview size limit exceeded, changes collapsed.

fs/xfs/libxfs/xfs_btree.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -168,7 +168,7 @@ xfs_btree_check_lptr(
		xfs_fsblock_t bno, /* btree block disk address */
		int level) /* btree block level */
		{
		XFS_WANT_CORRUPTED_RETURN(
		XFS_WANT_CORRUPTED_RETURN(cur->bc_mp,
		level > 0 &&
		bno != NULLFSBLOCK &&
		XFS_FSB_SANITY_CHECK(cur->bc_mp, bno));
		@@ -187,7 +187,7 @@ xfs_btree_check_sptr(
		{
		xfs_agblock_t agblocks = cur->bc_mp->m_sb.sb_agblocks;

		XFS_WANT_CORRUPTED_RETURN(
		XFS_WANT_CORRUPTED_RETURN(cur->bc_mp,
		level > 0 &&
		bno != NULLAGBLOCK &&
		bno != 0 &&
		@@ -1825,7 +1825,7 @@ xfs_btree_lookup(
		error = xfs_btree_increment(cur, 0, &i);
		if (error)
		goto error0;
		XFS_WANT_CORRUPTED_RETURN(i == 1);
		XFS_WANT_CORRUPTED_RETURN(cur->bc_mp, i == 1);
		XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
		*stat = 1;
		return 0;
		@@ -2285,7 +2285,7 @@ xfs_btree_rshift(
		if (error)
		goto error0;
		i = xfs_btree_lastrec(tcur, level);
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0);

		error = xfs_btree_increment(tcur, level, &i);
		if (error)
		@@ -3138,7 +3138,7 @@ xfs_btree_insert(
		goto error0;
		}

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

		/*
		@@ -3582,15 +3582,15 @@ xfs_btree_delrec(
		* Actually any entry but the first would suffice.
		*/
		i = xfs_btree_lastrec(tcur, level);
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0);

		error = xfs_btree_increment(tcur, level, &i);
		if (error)
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0);

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

		/* Grab a pointer to the block. */
		right = xfs_btree_get_block(tcur, level, &rbp);
		@@ -3634,12 +3634,12 @@ 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(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0);

		error = xfs_btree_decrement(tcur, level, &i);
		if (error)
		goto error0;
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0);
		}
		}

		@@ -3653,13 +3653,13 @@ xfs_btree_delrec(
		* previous block.
		*/
		i = xfs_btree_firstrec(tcur, level);
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0);

		error = xfs_btree_decrement(tcur, level, &i);
		if (error)
		goto error0;
		i = xfs_btree_firstrec(tcur, level);
		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
		XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0);

		/* Grab a pointer to the block. */
		left = xfs_btree_get_block(tcur, level, &lbp);

fs/xfs/libxfs/xfs_dir2_data.c

+20 −19

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ __xfs_dir3_data_check(
		* so just ensure that the count falls somewhere inside the
		* block right now.
		*/
		XFS_WANT_CORRUPTED_RETURN(be32_to_cpu(btp->count) <
		XFS_WANT_CORRUPTED_RETURN(mp, be32_to_cpu(btp->count) <
		((char *)btp - p) / sizeof(struct xfs_dir2_leaf_entry));
		break;
		case cpu_to_be32(XFS_DIR3_DATA_MAGIC):
		@@ -107,21 +107,21 @@ __xfs_dir3_data_check(
		bf = ops->data_bestfree_p(hdr);
		count = lastfree = freeseen = 0;
		if (!bf[0].length) {
		XFS_WANT_CORRUPTED_RETURN(!bf[0].offset);
		XFS_WANT_CORRUPTED_RETURN(mp, !bf[0].offset);
		freeseen \|= 1 << 0;
		}
		if (!bf[1].length) {
		XFS_WANT_CORRUPTED_RETURN(!bf[1].offset);
		XFS_WANT_CORRUPTED_RETURN(mp, !bf[1].offset);
		freeseen \|= 1 << 1;
		}
		if (!bf[2].length) {
		XFS_WANT_CORRUPTED_RETURN(!bf[2].offset);
		XFS_WANT_CORRUPTED_RETURN(mp, !bf[2].offset);
		freeseen \|= 1 << 2;
		}

		XFS_WANT_CORRUPTED_RETURN(be16_to_cpu(bf[0].length) >=
		XFS_WANT_CORRUPTED_RETURN(mp, be16_to_cpu(bf[0].length) >=
		be16_to_cpu(bf[1].length));
		XFS_WANT_CORRUPTED_RETURN(be16_to_cpu(bf[1].length) >=
		XFS_WANT_CORRUPTED_RETURN(mp, be16_to_cpu(bf[1].length) >=
		be16_to_cpu(bf[2].length));
		/*
		* Loop over the data/unused entries.
		@@ -134,18 +134,18 @@ __xfs_dir3_data_check(
		* doesn't need to be there.
		*/
		if (be16_to_cpu(dup->freetag) == XFS_DIR2_DATA_FREE_TAG) {
		XFS_WANT_CORRUPTED_RETURN(lastfree == 0);
		XFS_WANT_CORRUPTED_RETURN(
		XFS_WANT_CORRUPTED_RETURN(mp, lastfree == 0);
		XFS_WANT_CORRUPTED_RETURN(mp,
		be16_to_cpu(*xfs_dir2_data_unused_tag_p(dup)) ==
		(char )dup - (char )hdr);
		dfp = xfs_dir2_data_freefind(hdr, bf, dup);
		if (dfp) {
		i = (int)(dfp - bf);
		XFS_WANT_CORRUPTED_RETURN(
		XFS_WANT_CORRUPTED_RETURN(mp,
		(freeseen & (1 << i)) == 0);
		freeseen \|= 1 << i;
		} else {
		XFS_WANT_CORRUPTED_RETURN(
		XFS_WANT_CORRUPTED_RETURN(mp,
		be16_to_cpu(dup->length) <=
		be16_to_cpu(bf[2].length));
		}
		@@ -160,13 +160,13 @@ __xfs_dir3_data_check(
		* The linear search is crude but this is DEBUG code.
		*/
		dep = (xfs_dir2_data_entry_t *)p;
		XFS_WANT_CORRUPTED_RETURN(dep->namelen != 0);
		XFS_WANT_CORRUPTED_RETURN(
		XFS_WANT_CORRUPTED_RETURN(mp, dep->namelen != 0);
		XFS_WANT_CORRUPTED_RETURN(mp,
		!xfs_dir_ino_validate(mp, be64_to_cpu(dep->inumber)));
		XFS_WANT_CORRUPTED_RETURN(
		XFS_WANT_CORRUPTED_RETURN(mp,
		be16_to_cpu(*ops->data_entry_tag_p(dep)) ==
		(char )dep - (char )hdr);
		XFS_WANT_CORRUPTED_RETURN(
		XFS_WANT_CORRUPTED_RETURN(mp,
		ops->data_get_ftype(dep) < XFS_DIR3_FT_MAX);
		count++;
		lastfree = 0;
		@@ -183,14 +183,15 @@ __xfs_dir3_data_check(
		be32_to_cpu(lep[i].hashval) == hash)
		break;
		}
		XFS_WANT_CORRUPTED_RETURN(i < be32_to_cpu(btp->count));
		XFS_WANT_CORRUPTED_RETURN(mp,
		i < be32_to_cpu(btp->count));
		}
		p += ops->data_entsize(dep->namelen);
		}
		/*
		* Need to have seen all the entries and all the bestfree slots.
		*/
		XFS_WANT_CORRUPTED_RETURN(freeseen == 7);
		XFS_WANT_CORRUPTED_RETURN(mp, freeseen == 7);
		if (hdr->magic == cpu_to_be32(XFS_DIR2_BLOCK_MAGIC) \|\|
		hdr->magic == cpu_to_be32(XFS_DIR3_BLOCK_MAGIC)) {
		for (i = stale = 0; i < be32_to_cpu(btp->count); i++) {
		@@ -198,13 +199,13 @@ __xfs_dir3_data_check(
		cpu_to_be32(XFS_DIR2_NULL_DATAPTR))
		stale++;
		if (i > 0)
		XFS_WANT_CORRUPTED_RETURN(
		XFS_WANT_CORRUPTED_RETURN(mp,
		be32_to_cpu(lep[i].hashval) >=
		be32_to_cpu(lep[i - 1].hashval));
		}
		XFS_WANT_CORRUPTED_RETURN(count ==
		XFS_WANT_CORRUPTED_RETURN(mp, count ==
		be32_to_cpu(btp->count) - be32_to_cpu(btp->stale));
		XFS_WANT_CORRUPTED_RETURN(stale == be32_to_cpu(btp->stale));
		XFS_WANT_CORRUPTED_RETURN(mp, stale == be32_to_cpu(btp->stale));
		}
		return 0;
		}