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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index e9fcb6d496a4ae4b4f4fae2a5591e22eeae07267..08df809e231521eace21df09737d6bb4fff99659 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -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);

diff --git a/fs/xfs/libxfs/xfs_bmap_btree.h b/fs/xfs/libxfs/xfs_bmap_btree.h
index 714bfbaf9b2dca8514fb9c1a8e428e1b9963c6cf..135b8c56d23e83c492812982120a093bf7cc5527 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap_btree.h
+++ b/fs/xfs/libxfs/xfs_bmap_btree.h
@@ -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))

diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c
index af31d5826c320bd63d4af53e450c83e2de1e8063..1c90ec41e9dfa9cc8a380635ebf99d7380d9fe03 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_fork.c
+++ b/fs/xfs/libxfs/xfs_inode_fork.c
@@ -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++;
        }