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

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

xfs: pass struct xfs_bmbt_irec to xfs_bmbt_validate_extent 



This removed an unaligned load per extent, as well as the manual poking
into the on-disk extent format.

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

fs/xfs/libxfs/xfs_bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -1261,13 +1261,13 @@ xfs_iread_extents( 
		 */

		frp = XFS_BMBT_REC_ADDR(mp, block, 1);

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

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

			xfs_bmbt_disk_get_all(frp, &new);

			if (!xfs_bmbt_validate_extent(mp, whichfork, &new)) {

				XFS_ERROR_REPORT("xfs_bmap_read_extents(2)",

						 XFS_ERRLEVEL_LOW, mp);

				error = -EFSCORRUPTED;

				goto out_brelse;

			}

			xfs_bmbt_disk_get_all(frp, &new);

			xfs_iext_insert(ip, &icur, &new, state);

			trace_xfs_read_extent(ip, &icur, state, _THIS_IP_);

			xfs_iext_next(ifp, &icur);

fs/xfs/libxfs/xfs_bmap_btree.h

+2 −2
Original line number Diff line number Diff line
@@ -122,9 +122,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 *ep)

		struct xfs_bmbt_irec *irec)

{

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

	if (irec->br_state == XFS_EXT_NORM)

		return true;

	if (whichfork == XFS_DATA_FORK &&

	    xfs_sb_version_hasextflgbit(&mp->m_sb))

fs/xfs/libxfs/xfs_inode_fork.c

+3 −3
Original line number Diff line number Diff line
@@ -355,13 +355,13 @@ xfs_iformat_extents( 


		xfs_iext_first(ifp, &icur);

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

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

			xfs_bmbt_disk_get_all(dp, &new);

			if (!xfs_bmbt_validate_extent(mp, whichfork, &new)) {

				XFS_ERROR_REPORT("xfs_iformat_extents(2)",

						 XFS_ERRLEVEL_LOW, mp);

				return -EFSCORRUPTED;

			}



			xfs_bmbt_disk_get_all(dp, &new);

			xfs_iext_insert(ip, &icur, &new, state);

			trace_xfs_read_extent(ip, &icur, state, _THIS_IP_);

			xfs_iext_next(ifp, &icur);
@@ -704,9 +704,9 @@ xfs_iextents_copy( 
	for_each_xfs_iext(ifp, &icur, &rec) {

		if (isnullstartblock(rec.br_startblock))

			continue;

		ASSERT(xfs_bmbt_validate_extent(ip->i_mount, whichfork, &rec));

		xfs_bmbt_disk_set_all(dp, &rec);

		trace_xfs_write_extent(ip, &icur, state, _RET_IP_);

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

		copied += sizeof(struct xfs_bmbt_rec);

		dp++;

	}