xfs: add CRC checking to dir2 leaf blocks

This addition follows the same pattern as the dir2 block CRCs.
Seeing as both LEAF1 and LEAFN types need to changed at the same
time, this is a pretty large amount of change. leaf block headers
need to be abstracted away from the on-disk structures (struct
xfs_dir3_icleaf_hdr), as do the base leaf entry locations.

This header abstract allows the in-core header and leaf entry
location to be passed around instead of the leaf block itself. This
saves a lot of converting individual variables from on-disk format
to host format where they are used, so there's a good chance that
the compiler will be able to produce much more optimal code as it's
not having to byteswap variables all over the place.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

1 files changed, 12 insertions, 7 deletions

diff --git a/fs/xfs/xfs_dir2_block.c b/fs/xfs/xfs_dir2_block.c
index 7ec87c20cbd2..d2e445f92ffb 100644
--- a/fs/xfs/xfs_dir2_block.c
+++ b/fs/xfs/xfs_dir2_block.c
@@ -1013,6 +1013,8 @@ xfs_dir2_leaf_to_block(
         __be16                  *tagp;          /* end of entry (tag) */
         int                     to;             /* block/leaf to index */
         xfs_trans_t             *tp;            /* transaction pointer */
+        struct xfs_dir2_leaf_entry *ents;
+        struct xfs_dir3_icleaf_hdr leafhdr;
 
         trace_xfs_dir2_leaf_to_block(args);
 
@@ -1020,8 +1022,12 @@ xfs_dir2_leaf_to_block(
         tp = args->trans;
         mp = dp->i_mount;
         leaf = lbp->b_addr;
-        ASSERT(leaf->hdr.info.magic == cpu_to_be16(XFS_DIR2_LEAF1_MAGIC));
+        xfs_dir3_leaf_hdr_from_disk(&leafhdr, leaf);
+        ents = xfs_dir3_leaf_ents_p(leaf);
         ltp = xfs_dir2_leaf_tail_p(mp, leaf);
+
+        ASSERT(leafhdr.magic == XFS_DIR2_LEAF1_MAGIC ||
+               leafhdr.magic == XFS_DIR3_LEAF1_MAGIC);
         /*
          * If there are data blocks other than the first one, take this
          * opportunity to remove trailing empty data blocks that may have
@@ -1058,7 +1064,7 @@ xfs_dir2_leaf_to_block(
          * Size of the "leaf" area in the block.
          */
         size = (uint)sizeof(xfs_dir2_block_tail_t) +
-               (uint)sizeof(*lep) * (be16_to_cpu(leaf->hdr.count) - be16_to_cpu(leaf->hdr.stale));
+               (uint)sizeof(*lep) * (leafhdr.count - leafhdr.stale);
         /*
          * Look at the last data entry.
          */
@@ -1087,18 +1093,17 @@ xfs_dir2_leaf_to_block(
          * Initialize the block tail.
          */
         btp = xfs_dir2_block_tail_p(mp, hdr);
-        btp->count = cpu_to_be32(be16_to_cpu(leaf->hdr.count) - be16_to_cpu(leaf->hdr.stale));
+        btp->count = cpu_to_be32(leafhdr.count - leafhdr.stale);
         btp->stale = 0;
         xfs_dir2_block_log_tail(tp, dbp);
         /*
          * Initialize the block leaf area.  We compact out stale entries.
          */
         lep = xfs_dir2_block_leaf_p(btp);
-        for (from = to = 0; from < be16_to_cpu(leaf->hdr.count); from++) {
-                if (leaf->ents[from].address ==
-                    cpu_to_be32(XFS_DIR2_NULL_DATAPTR))
+        for (from = to = 0; from < leafhdr.count; from++) {
+                if (ents[from].address == cpu_to_be32(XFS_DIR2_NULL_DATAPTR))
                         continue;
-                lep[to++] = leaf->ents[from];
+                lep[to++] = ents[from];
         }
         ASSERT(to == be32_to_cpu(btp->count));
         xfs_dir2_block_log_leaf(tp, dbp, 0, be32_to_cpu(btp->count) - 1);