Merge branch 'xfs-misc-fixes-for-4.5' into for-next (7eeabbd4) · Commits · e / devices / android_kernel_teracube_emerald

fs/xfs/libxfs/xfs_alloc.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -535,6 +535,7 @@ xfs_agfl_write_verify(
		}

		const struct xfs_buf_ops xfs_agfl_buf_ops = {
		.name = "xfs_agfl",
		.verify_read = xfs_agfl_read_verify,
		.verify_write = xfs_agfl_write_verify,
		};
		@@ -1926,7 +1927,7 @@ xfs_alloc_space_available(
		* Decide whether to use this allocation group for this allocation.
		* If so, fix up the btree freelist's size.
		*/
		STATIC int /* error */
		int /* error */
		xfs_alloc_fix_freelist(
		struct xfs_alloc_arg args, / allocation argument structure */
		int flags) /* XFS_ALLOC_FLAG_... */
		@@ -2339,6 +2340,7 @@ xfs_agf_write_verify(
		}

		const struct xfs_buf_ops xfs_agf_buf_ops = {
		.name = "xfs_agf",
		.verify_read = xfs_agf_read_verify,
		.verify_write = xfs_agf_write_verify,
		};

fs/xfs/libxfs/xfs_alloc.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -235,5 +235,6 @@ xfs_alloc_get_rec(

		int xfs_read_agf(struct xfs_mount mp, struct xfs_trans tp,
		xfs_agnumber_t agno, int flags, struct xfs_buf **bpp);
		int xfs_alloc_fix_freelist(struct xfs_alloc_arg *args, int flags);

		#endif /* __XFS_ALLOC_H__ */

fs/xfs/libxfs/xfs_alloc_btree.c

+4 −31

Original line number	Diff line number	Diff line
		@@ -293,14 +293,7 @@ xfs_allocbt_verify(
		level = be16_to_cpu(block->bb_level);
		switch (block->bb_magic) {
		case cpu_to_be32(XFS_ABTB_CRC_MAGIC):
		if (!xfs_sb_version_hascrc(&mp->m_sb))
		return false;
		if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))
		return false;
		if (block->bb_u.s.bb_blkno != cpu_to_be64(bp->b_bn))
		return false;
		if (pag &&
		be32_to_cpu(block->bb_u.s.bb_owner) != pag->pag_agno)
		if (!xfs_btree_sblock_v5hdr_verify(bp))
		return false;
		/* fall through */
		case cpu_to_be32(XFS_ABTB_MAGIC):
		@@ -311,14 +304,7 @@ xfs_allocbt_verify(
		return false;
		break;
		case cpu_to_be32(XFS_ABTC_CRC_MAGIC):
		if (!xfs_sb_version_hascrc(&mp->m_sb))
		return false;
		if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))
		return false;
		if (block->bb_u.s.bb_blkno != cpu_to_be64(bp->b_bn))
		return false;
		if (pag &&
		be32_to_cpu(block->bb_u.s.bb_owner) != pag->pag_agno)
		if (!xfs_btree_sblock_v5hdr_verify(bp))
		return false;
		/* fall through */
		case cpu_to_be32(XFS_ABTC_MAGIC):
		@@ -332,21 +318,7 @@ xfs_allocbt_verify(
		return false;
		}

		/* numrecs verification */
		if (be16_to_cpu(block->bb_numrecs) > mp->m_alloc_mxr[level != 0])
		return false;

		/* sibling pointer verification */
		if (!block->bb_u.s.bb_leftsib \|\|
		(be32_to_cpu(block->bb_u.s.bb_leftsib) >= mp->m_sb.sb_agblocks &&
		block->bb_u.s.bb_leftsib != cpu_to_be32(NULLAGBLOCK)))
		return false;
		if (!block->bb_u.s.bb_rightsib \|\|
		(be32_to_cpu(block->bb_u.s.bb_rightsib) >= mp->m_sb.sb_agblocks &&
		block->bb_u.s.bb_rightsib != cpu_to_be32(NULLAGBLOCK)))
		return false;

		return true;
		return xfs_btree_sblock_verify(bp, mp->m_alloc_mxr[level != 0]);
		}

		static void
		@@ -379,6 +351,7 @@ xfs_allocbt_write_verify(
		}

		const struct xfs_buf_ops xfs_allocbt_buf_ops = {
		.name = "xfs_allocbt",
		.verify_read = xfs_allocbt_read_verify,
		.verify_write = xfs_allocbt_write_verify,
		};

fs/xfs/libxfs/xfs_attr_leaf.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -328,6 +328,7 @@ xfs_attr3_leaf_read_verify(
		}

		const struct xfs_buf_ops xfs_attr3_leaf_buf_ops = {
		.name = "xfs_attr3_leaf",
		.verify_read = xfs_attr3_leaf_read_verify,
		.verify_write = xfs_attr3_leaf_write_verify,
		};

fs/xfs/libxfs/xfs_attr_remote.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -201,6 +201,7 @@ xfs_attr3_rmt_write_verify(
		}

		const struct xfs_buf_ops xfs_attr3_rmt_buf_ops = {
		.name = "xfs_attr3_rmt",
		.verify_read = xfs_attr3_rmt_read_verify,
		.verify_write = xfs_attr3_rmt_write_verify,
		};