Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 438c3c8d authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'xfs-buf-type-fixes' into for-next

parents 465e2def 3443a3bc

fs/xfs/libxfs/xfs_bmap.c

+5 −1
Original line number Diff line number Diff line
@@ -973,7 +973,11 @@ xfs_bmap_local_to_extents( 
	*firstblock = args.fsbno;

	bp = xfs_btree_get_bufl(args.mp, tp, args.fsbno, 0);



	/* initialise the block and copy the data */

	/*

	 * Initialise the block and copy the data

	 *

	 * Note: init_fn must set the buffer log item type correctly!

	 */

	init_fn(tp, bp, ip, ifp);



	/* account for the change in fork size and log everything */

fs/xfs/libxfs/xfs_symlink_remote.c

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ xfs_symlink_local_to_remote( 
	struct xfs_mount	*mp = ip->i_mount;

	char			*buf;



	xfs_trans_buf_set_type(tp, bp, XFS_BLFT_SYMLINK_BUF);



	if (!xfs_sb_version_hascrc(&mp->m_sb)) {

		bp->b_ops = NULL;

		memcpy(bp->b_addr, ifp->if_u1.if_data, ifp->if_bytes);

fs/xfs/xfs_buf_item.c

+4 −0
Original line number Diff line number Diff line
@@ -319,6 +319,10 @@ xfs_buf_item_format( 
	ASSERT(atomic_read(&bip->bli_refcount) > 0);

	ASSERT((bip->bli_flags & XFS_BLI_LOGGED) ||

	       (bip->bli_flags & XFS_BLI_STALE));

	ASSERT((bip->bli_flags & XFS_BLI_STALE) ||

	       (xfs_blft_from_flags(&bip->__bli_format) > XFS_BLFT_UNKNOWN_BUF

	        && xfs_blft_from_flags(&bip->__bli_format) < XFS_BLFT_MAX_BUF));





	/*

	 * If it is an inode buffer, transfer the in-memory state to the

fs/xfs/xfs_inode.c

+2 −0
Original line number Diff line number Diff line
@@ -1995,6 +1995,7 @@ xfs_iunlink( 
	agi->agi_unlinked[bucket_index] = cpu_to_be32(agino);

	offset = offsetof(xfs_agi_t, agi_unlinked) +

		(sizeof(xfs_agino_t) * bucket_index);

	xfs_trans_buf_set_type(tp, agibp, XFS_BLFT_AGI_BUF);

	xfs_trans_log_buf(tp, agibp, offset,

			  (offset + sizeof(xfs_agino_t) - 1));

	return 0;
@@ -2086,6 +2087,7 @@ xfs_iunlink_remove( 
		agi->agi_unlinked[bucket_index] = cpu_to_be32(next_agino);

		offset = offsetof(xfs_agi_t, agi_unlinked) +

			(sizeof(xfs_agino_t) * bucket_index);

		xfs_trans_buf_set_type(tp, agibp, XFS_BLFT_AGI_BUF);

		xfs_trans_log_buf(tp, agibp, offset,

				  (offset + sizeof(xfs_agino_t) - 1));

	} else {

fs/xfs/xfs_trans.c

+1 −0
Original line number Diff line number Diff line
@@ -472,6 +472,7 @@ xfs_trans_apply_sb_deltas( 
		whole = 1;

	}



	xfs_trans_buf_set_type(tp, bp, XFS_BLFT_SB_BUF);

	if (whole)

		/*

		 * Log the whole thing, the fields are noncontiguous.