xfs: vectorise encoding/decoding directory headers
Conversion from on-disk structures to in-core header structures currently relies on magic number checks. If the magic number is wrong, but one of the supported values, we do the wrong thing with the encode/decode operation. Split these functions so that there are discrete operations for the specific directory format we are handling. In doing this, move all the header encode/decode functions to xfs_da_format.c as they are directly manipulating the on-disk format. It should be noted that all the growth in binary size is from xfs_da_format.c - the rest of the code actaully shrinks. text data bss dec hex filename 794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6 791421 96802 1096 889319 d91e7 fs/xfs/xfs.o.p7 Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Ben Myers <bpm@sgi.com> Signed-off-by: Ben Myers <bpm@sgi.com>
This commit is contained in:
@@ -76,13 +76,26 @@ struct xfs_dir_ops {
|
||||
(*data_unused_p)(struct xfs_dir2_data_hdr *hdr);
|
||||
|
||||
int (*leaf_hdr_size)(void);
|
||||
void (*leaf_hdr_to_disk)(struct xfs_dir2_leaf *to,
|
||||
struct xfs_dir3_icleaf_hdr *from);
|
||||
void (*leaf_hdr_from_disk)(struct xfs_dir3_icleaf_hdr *to,
|
||||
struct xfs_dir2_leaf *from);
|
||||
int (*leaf_max_ents)(struct xfs_mount *mp);
|
||||
struct xfs_dir2_leaf_entry *
|
||||
(*leaf_ents_p)(struct xfs_dir2_leaf *lp);
|
||||
|
||||
int (*node_hdr_size)(void);
|
||||
void (*node_hdr_to_disk)(struct xfs_da_intnode *to,
|
||||
struct xfs_da3_icnode_hdr *from);
|
||||
void (*node_hdr_from_disk)(struct xfs_da3_icnode_hdr *to,
|
||||
struct xfs_da_intnode *from);
|
||||
struct xfs_da_node_entry *
|
||||
(*node_tree_p)(struct xfs_da_intnode *dap);
|
||||
|
||||
void (*free_hdr_to_disk)(struct xfs_dir2_free *to,
|
||||
struct xfs_dir3_icfree_hdr *from);
|
||||
void (*free_hdr_from_disk)(struct xfs_dir3_icfree_hdr *to,
|
||||
struct xfs_dir2_free *from);
|
||||
};
|
||||
|
||||
extern const struct xfs_dir_ops *
|
||||
|
Reference in New Issue
Block a user