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

Commit f36bc228 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: pass an on-disk extent to xfs_bmbt_validate_extent 



This prepares for getting rid of the current in-memory extent format.
At the end of the series we will change the calling convention again
to pass the xfs_bmbt_irec structure once it is available everywhere.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 42630361

fs/xfs/libxfs/xfs_bmap.c

+3 −3
Original line number Diff line number Diff line
@@ -1260,14 +1260,14 @@ xfs_iread_extents( 
		frp = XFS_BMBT_REC_ADDR(mp, block, 1);

		for (j = 0; j < num_recs; j++, i++, frp++) {

			xfs_bmbt_rec_host_t *trp = xfs_iext_get_ext(ifp, i);

			trp->l0 = be64_to_cpu(frp->l0);

			trp->l1 = be64_to_cpu(frp->l1);

			if (!xfs_bmbt_validate_extent(mp, whichfork, trp)) {

			if (!xfs_bmbt_validate_extent(mp, whichfork, frp)) {

				XFS_ERROR_REPORT("xfs_bmap_read_extents(2)",

						 XFS_ERRLEVEL_LOW, mp);

				error = -EFSCORRUPTED;

				goto out_brelse;

			}

			trp->l0 = be64_to_cpu(frp->l0);

			trp->l1 = be64_to_cpu(frp->l1);

			trace_xfs_read_extent(ip, i, state, _THIS_IP_);

		}

		xfs_trans_brelse(tp, bp);

fs/xfs/libxfs/xfs_bmap_btree.h

+2 −2
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ extern struct xfs_btree_cur *xfs_bmbt_init_cursor(struct xfs_mount *, 
 * Check that the extent does not contain an invalid unwritten extent flag.

 */

static inline bool xfs_bmbt_validate_extent(struct xfs_mount *mp, int whichfork,

		struct xfs_bmbt_rec_host *ep)

		struct xfs_bmbt_rec *ep)

{

	if (ep->l0 >> (64 - BMBT_EXNTFLAG_BITLEN) == 0)

	if (get_unaligned_be64(&ep->l0) >> (64 - BMBT_EXNTFLAG_BITLEN) == 0)

		return true;

	if (whichfork == XFS_DATA_FORK &&

	    xfs_sb_version_hasextflgbit(&mp->m_sb))

fs/xfs/libxfs/xfs_inode_fork.c

+4 −5
Original line number Diff line number Diff line
@@ -371,13 +371,13 @@ xfs_iformat_extents( 
		dp = (xfs_bmbt_rec_t *) XFS_DFORK_PTR(dip, whichfork);

		for (i = 0; i < nex; i++, dp++) {

			xfs_bmbt_rec_host_t *ep = xfs_iext_get_ext(ifp, i);

			ep->l0 = get_unaligned_be64(&dp->l0);

			ep->l1 = get_unaligned_be64(&dp->l1);

			if (!xfs_bmbt_validate_extent(mp, whichfork, ep)) {

			if (!xfs_bmbt_validate_extent(mp, whichfork, dp)) {

				XFS_ERROR_REPORT("xfs_iformat_extents(2)",

						 XFS_ERRLEVEL_LOW, mp);

				return -EFSCORRUPTED;

			}

			ep->l0 = get_unaligned_be64(&dp->l0);

			ep->l1 = get_unaligned_be64(&dp->l1);

			trace_xfs_read_extent(ip, i, state, _THIS_IP_);

		}

	}
@@ -764,8 +764,6 @@ xfs_iextents_copy( 
	for (i = 0; i < nrecs; i++) {

		xfs_bmbt_rec_host_t *ep = xfs_iext_get_ext(ifp, i);



		ASSERT(xfs_bmbt_validate_extent(ip->i_mount, whichfork, ep));



		start_block = xfs_bmbt_get_startblock(ep);

		if (isnullstartblock(start_block)) {

			/*
@@ -779,6 +777,7 @@ xfs_iextents_copy( 
		/* Translate to on disk format */

		put_unaligned_be64(ep->l0, &dp->l0);

		put_unaligned_be64(ep->l1, &dp->l1);

		ASSERT(xfs_bmbt_validate_extent(ip->i_mount, whichfork, dp));



		dp++;

		copied++;