Merge branch 'xfs-logging-fixes' into for-next (316433be) · Commits · e / devices / android_kernel_sony_msm8998

fs/xfs/libxfs/xfs_alloc.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -482,7 +482,9 @@ xfs_agfl_verify(
		be32_to_cpu(agfl->agfl_bno[i]) >= mp->m_sb.sb_agblocks)
		return false;
		}
		return true;

		return xfs_log_check_lsn(mp,
		be64_to_cpu(XFS_BUF_TO_AGFL(bp)->agfl_lsn));
		}

		static void
		@@ -2259,9 +2261,13 @@ xfs_agf_verify(
		{
		struct xfs_agf *agf = XFS_BUF_TO_AGF(bp);

		if (xfs_sb_version_hascrc(&mp->m_sb) &&
		!uuid_equal(&agf->agf_uuid, &mp->m_sb.sb_meta_uuid))
		if (xfs_sb_version_hascrc(&mp->m_sb)) {
		if (!uuid_equal(&agf->agf_uuid, &mp->m_sb.sb_meta_uuid))
		return false;
		if (!xfs_log_check_lsn(mp,
		be64_to_cpu(XFS_BUF_TO_AGF(bp)->agf_lsn)))
		return false;
		}

		if (!(agf->agf_magicnum == cpu_to_be32(XFS_AGF_MAGIC) &&
		XFS_AGF_GOOD_VERSION(be32_to_cpu(agf->agf_versionnum)) &&

+3 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@
		#include "xfs_buf_item.h"
		#include "xfs_cksum.h"
		#include "xfs_dir2.h"
		#include "xfs_log.h"


		/*
		@@ -266,6 +267,8 @@ xfs_attr3_leaf_verify(
		return false;
		if (be64_to_cpu(hdr3->info.blkno) != bp->b_bn)
		return false;
		if (!xfs_log_check_lsn(mp, be64_to_cpu(hdr3->info.lsn)))
		return false;
		} else {
		if (ichdr.magic != XFS_ATTR_LEAF_MAGIC)
		return false;

+6 −4

Original line number	Diff line number	Diff line
		@@ -948,14 +948,16 @@ xfs_bmap_local_to_extents(
		bp = xfs_btree_get_bufl(args.mp, tp, args.fsbno, 0);

		/*
		* Initialise the block and copy the data
		* Initialize the block, copy the data and log the remote buffer.
		*
		* Note: init_fn must set the buffer log item type correctly!
		* The callout is responsible for logging because the remote format
		* might differ from the local format and thus we don't know how much to
		* log here. Note that init_fn must also set the buffer log item type
		* correctly.
		*/
		init_fn(tp, bp, ip, ifp);

		/* account for the change in fork size and log everything */
		xfs_trans_log_buf(tp, bp, 0, ifp->if_bytes - 1);
		/* account for the change in fork size */
		xfs_idata_realloc(ip, -ifp->if_bytes, whichfork);
		xfs_bmap_local_to_extents_empty(ip, whichfork);
		flags \|= XFS_ILOG_CORE;

+15 −2

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@
		#include "xfs_trace.h"
		#include "xfs_cksum.h"
		#include "xfs_alloc.h"
		#include "xfs_log.h"

		/*
		* Cursor allocation zone.
		@@ -243,8 +244,14 @@ bool
		xfs_btree_lblock_verify_crc(
		struct xfs_buf *bp)
		{
		if (xfs_sb_version_hascrc(&bp->b_target->bt_mount->m_sb))
		struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp);
		struct xfs_mount *mp = bp->b_target->bt_mount;

		if (xfs_sb_version_hascrc(&mp->m_sb)) {
		if (!xfs_log_check_lsn(mp, be64_to_cpu(block->bb_u.l.bb_lsn)))
		return false;
		return xfs_buf_verify_cksum(bp, XFS_BTREE_LBLOCK_CRC_OFF);
		}

		return true;
		}
		@@ -275,8 +282,14 @@ bool
		xfs_btree_sblock_verify_crc(
		struct xfs_buf *bp)
		{
		if (xfs_sb_version_hascrc(&bp->b_target->bt_mount->m_sb))
		struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp);
		struct xfs_mount *mp = bp->b_target->bt_mount;

		if (xfs_sb_version_hascrc(&mp->m_sb)) {
		if (!xfs_log_check_lsn(mp, be64_to_cpu(block->bb_u.s.bb_lsn)))
		return false;
		return xfs_buf_verify_cksum(bp, XFS_BTREE_SBLOCK_CRC_OFF);
		}

		return true;
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@
		#include "xfs_trace.h"
		#include "xfs_cksum.h"
		#include "xfs_buf_item.h"
		#include "xfs_log.h"

		/*
		* xfs_da_btree.c
		@@ -150,6 +151,8 @@ xfs_da3_node_verify(
		return false;
		if (be64_to_cpu(hdr3->info.blkno) != bp->b_bn)
		return false;
		if (!xfs_log_check_lsn(mp, be64_to_cpu(hdr3->info.lsn)))
		return false;
		} else {
		if (ichdr.magic != XFS_DA_NODE_MAGIC)
		return false;
		@@ -322,6 +325,7 @@ xfs_da3_node_create(
		if (xfs_sb_version_hascrc(&mp->m_sb)) {
		struct xfs_da3_node_hdr *hdr3 = bp->b_addr;

		memset(hdr3, 0, sizeof(struct xfs_da3_node_hdr));
		ichdr.magic = XFS_DA3_NODE_MAGIC;
		hdr3->info.blkno = cpu_to_be64(bp->b_bn);
		hdr3->info.owner = cpu_to_be64(args->dp->i_ino);