Merge branch 'xfs-4.10-misc-fixes-3' into for-next (a444d72e) · Commits · 戴 / test

fs/xfs/libxfs/xfs_alloc.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -2455,12 +2455,15 @@ xfs_agf_verify(
		be32_to_cpu(agf->agf_flcount) <= XFS_AGFL_SIZE(mp)))
		return false;

		if (be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) > XFS_BTREE_MAXLEVELS \|\|
		if (be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) < 1 \|\|
		be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]) < 1 \|\|
		be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) > XFS_BTREE_MAXLEVELS \|\|
		be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]) > XFS_BTREE_MAXLEVELS)
		return false;

		if (xfs_sb_version_hasrmapbt(&mp->m_sb) &&
		be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) > XFS_BTREE_MAXLEVELS)
		(be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) < 1 \|\|
		be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) > XFS_BTREE_MAXLEVELS))
		return false;

		/*
		@@ -2477,7 +2480,8 @@ xfs_agf_verify(
		return false;

		if (xfs_sb_version_hasreflink(&mp->m_sb) &&
		be32_to_cpu(agf->agf_refcount_level) > XFS_BTREE_MAXLEVELS)
		(be32_to_cpu(agf->agf_refcount_level) < 1 \|\|
		be32_to_cpu(agf->agf_refcount_level) > XFS_BTREE_MAXLEVELS))
		return false;

		return true;;

+4 −0

Original line number	Diff line number	Diff line
		@@ -428,6 +428,10 @@ xfs_allocbt_init_cursor(
		cur->bc_btnum = btnum;
		cur->bc_blocklog = mp->m_sb.sb_blocklog;
		cur->bc_ops = &xfs_allocbt_ops;
		if (btnum == XFS_BTNUM_BNO)
		cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_abtb_2);
		else
		cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_abtc_2);

		if (btnum == XFS_BTNUM_CNT) {
		cur->bc_nlevels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]);

+1 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ int xfs_attr3_leaf_add(struct xfs_buf *leaf_buffer,
		struct xfs_da_args *args);
		int xfs_attr3_leaf_remove(struct xfs_buf *leaf_buffer,
		struct xfs_da_args *args);
		int xfs_attr3_leaf_list_int(struct xfs_buf *bp,
		void xfs_attr3_leaf_list_int(struct xfs_buf *bp,
		struct xfs_attr_list_context *context);

		/*

+10 −4

Original line number	Diff line number	Diff line
		@@ -518,7 +518,7 @@ void
		xfs_bmap_trace_exlist(
		xfs_inode_t ip, / incore inode pointer */
		xfs_extnum_t cnt, /* count of entries in the list */
		int whichfork, /* data or attr fork */
		int whichfork, /* data or attr or cow fork */
		unsigned long caller_ip)
		{
		xfs_extnum_t idx; /* extent record index */
		@@ -527,11 +527,13 @@ xfs_bmap_trace_exlist(

		if (whichfork == XFS_ATTR_FORK)
		state \|= BMAP_ATTRFORK;
		else if (whichfork == XFS_COW_FORK)
		state \|= BMAP_COWFORK;

		ifp = XFS_IFORK_PTR(ip, whichfork);
		ASSERT(cnt == xfs_iext_count(ifp));
		for (idx = 0; idx < cnt; idx++)
		trace_xfs_extlist(ip, idx, whichfork, caller_ip);
		trace_xfs_extlist(ip, idx, state, caller_ip);
		}

		/*
		@@ -1151,6 +1153,10 @@ xfs_bmap_add_attrfork(
		goto trans_cancel;
		if (XFS_IFORK_Q(ip))
		goto trans_cancel;
		if (ip->i_d.di_anextents != 0) {
		error = -EFSCORRUPTED;
		goto trans_cancel;
		}
		if (ip->i_d.di_aformat != XFS_DINODE_FMT_EXTENTS) {
		/*
		* For inodes coming from pre-6.2 filesystems.
		@@ -1158,7 +1164,6 @@ xfs_bmap_add_attrfork(
		ASSERT(ip->i_d.di_aformat == 0);
		ip->i_d.di_aformat = XFS_DINODE_FMT_EXTENTS;
		}
		ASSERT(ip->i_d.di_anextents == 0);

		xfs_trans_ijoin(tp, ip, 0);
		xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
		@@ -1375,8 +1380,9 @@ xfs_bmap_read_extents(
		return error;
		block = XFS_BUF_TO_BLOCK(bp);
		}
		if (i != XFS_IFORK_NEXTENTS(ip, whichfork))
		return -EFSCORRUPTED;
		ASSERT(i == xfs_iext_count(ifp));
		ASSERT(i == XFS_IFORK_NEXTENTS(ip, whichfork));
		XFS_BMAP_TRACE_EXLIST(ip, i, whichfork);
		return 0;
		error0:

+1 −0

Original line number	Diff line number	Diff line
		@@ -803,6 +803,7 @@ xfs_bmbt_init_cursor(
		cur->bc_nlevels = be16_to_cpu(ifp->if_broot->bb_level) + 1;
		cur->bc_btnum = XFS_BTNUM_BMAP;
		cur->bc_blocklog = mp->m_sb.sb_blocklog;
		cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_bmbt_2);

		cur->bc_ops = &xfs_bmbt_ops;
		cur->bc_flags = XFS_BTREE_LONG_PTRS \| XFS_BTREE_ROOT_IN_INODE;