db: add a special directory buffer verifier

Because we only have a single directory type that is used for all
the different buffer types, we need to provide a special verifier
for the read code. That verifier needs to know all the directory
types and when it find one it knows about, switch to the correct
verifier and call it.

We already do this for certain readahead cases in the directory
code, so there is precedence for this. If we don't find a magic
number we recognise, the verifier fails...

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>

diff --git a/db/dir2.c b/db/dir2.c
index 2ec64e0961133d3ad707f64d74ee80adf6f749ab..d2423da9c72a6dcae456d6a1ff3432793514a9d4 100644 (file)
--- a/db/dir2.c
+++ b/db/dir2.c
@@ -24,6 +24,7 @@
 #include "field.h"
 #include "dir2.h"
 #include "init.h"
+#include "output.h"
 
 static int     dir2_block_hdr_count(void *obj, int startoff);
 static int     dir2_block_leaf_count(void *obj, int startoff);
@@ -975,3 +976,63 @@ const field_t      da3_node_hdr_flds[] = {
        { "pad", FLDT_UINT32D, OI(H3OFF(__pad32)), C1, 0, TYP_NONE },
        { NULL }
 };
+
+/*
+ * Special read verifier for directory buffers. Detect the magic number
+ * appropriately and set the correct verifier and call it.
+ */
+static void
+xfs_dir3_db_read_verify(
+       struct xfs_buf          *bp)
+{
+       __be32                  magic32;
+       __be16                  magic16;
+
+       magic32 = *(__be32 *)bp->b_addr;
+       magic16 = ((struct xfs_da_blkinfo *)bp->b_addr)->magic;
+
+       switch (magic32) {
+       case cpu_to_be32(XFS_DIR3_BLOCK_MAGIC):
+               bp->b_ops = &xfs_dir3_block_buf_ops;
+               goto verify;
+       case cpu_to_be32(XFS_DIR3_DATA_MAGIC):
+               bp->b_ops = &xfs_dir3_data_buf_ops;
+               goto verify;
+       case cpu_to_be32(XFS_DIR3_FREE_MAGIC):
+               bp->b_ops = &xfs_dir3_free_buf_ops;
+               goto verify;
+       default:
+               break;
+       }
+
+       switch (magic16) {
+       case cpu_to_be16(XFS_DIR3_LEAF1_MAGIC):
+               bp->b_ops = &xfs_dir3_leaf1_buf_ops;
+               break;
+       case cpu_to_be16(XFS_DIR3_LEAFN_MAGIC):
+               bp->b_ops = &xfs_dir3_leafn_buf_ops;
+               break;
+       case cpu_to_be16(XFS_DA3_NODE_MAGIC):
+               bp->b_ops = &xfs_da3_node_buf_ops;
+               break;
+       default:
+               dbprintf(_("Unknown directory buffer type!\n"));
+               xfs_buf_ioerror(bp, EFSCORRUPTED);
+               return;
+       }
+verify:
+       bp->b_ops->verify_read(bp);
+}
+
+static void
+xfs_dir3_db_write_verify(
+       struct xfs_buf          *bp)
+{
+       dbprintf(_("Writing unknown directory buffer type!\n"));
+       xfs_buf_ioerror(bp, EFSCORRUPTED);
+}
+
+const struct xfs_buf_ops xfs_dir3_db_buf_ops = {
+       .verify_read = xfs_dir3_db_read_verify,
+       .verify_write = xfs_dir3_db_write_verify,
+};

diff --git a/db/dir2.h b/db/dir2.h
index b3651d577b8fc0d7a5cee1ef421e32f299bb5432..5054493590b06d6324740ea2ae68757f1e61ddf7 100644 (file)
--- a/db/dir2.h
+++ b/db/dir2.h
@@ -60,3 +60,5 @@ static inline xfs_dir2_inou_t *xfs_dir2_sf_inumberp(xfs_dir2_sf_entry_t *sfep)
 
 extern int     dir2_data_union_size(void *obj, int startoff, int idx);
 extern int     dir2_size(void *obj, int startoff, int idx);
+
+extern const struct xfs_buf_ops xfs_dir3_db_buf_ops;

diff --git a/db/type.c b/db/type.c
index b3f3d8783edc1bad54319074e882aea619751964..2c3431e38ddf2eeb56a65428230cb127d4cb9da4 100644 (file)
--- a/db/type.c
+++ b/db/type.c
@@ -87,7 +87,8 @@ static const typ_t    __typtab_crc[] = {
        { TYP_CNTBT, "cntbt", handle_struct, cntbt_crc_hfld,
                &xfs_allocbt_buf_ops },
        { TYP_DATA, "data", handle_block, NULL, NULL },
-       { TYP_DIR2, "dir3", handle_struct, dir3_hfld, NULL },
+       { TYP_DIR2, "dir3", handle_struct, dir3_hfld,
+               &xfs_dir3_db_buf_ops },
        { TYP_DQBLK, "dqblk", handle_struct, dqblk_hfld,
                &xfs_dquot_buf_ops },
        { TYP_INOBT, "inobt", handle_struct, inobt_crc_hfld,