On Fri, Oct 25, 2013 at 01:46:46PM -0500, Ben Myers wrote:
> On Tue, Oct 15, 2013 at 09:18:03AM +1100, Dave Chinner wrote:
> > From: Dave Chinner <dchinner@xxxxxxxxxx>
> >
> > 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@xxxxxxxxxx>
>
>
> > const struct xfs_dir_ops xfs_dir2_ops = {
> > .sf_entsize = xfs_dir2_sf_entsize,
> > .sf_nextentry = xfs_dir2_sf_nextentry,
> > @@ -532,10 +712,14 @@ const struct xfs_dir_ops xfs_dir2_ops = {
> > .data_unused_p = xfs_dir2_data_unused_p,
> >
> > .leaf_hdr_size = xfs_dir2_leaf_hdr_size,
> > + .leaf_hdr_to_disk = xfs_dir2_leaf_hdr_to_disk,
> > + .leaf_hdr_from_disk = xfs_dir2_leaf_hdr_from_disk,
> > .leaf_max_ents = xfs_dir2_max_leaf_ents,
> > .leaf_ents_p = xfs_dir2_leaf_ents_p,
> >
> > .node_hdr_size = xfs_da2_node_hdr_size,
> > + .node_hdr_to_disk = xfs_da2_node_hdr_to_disk,
> > + .node_hdr_from_disk = xfs_da2_node_hdr_from_disk,
> > .node_tree_p = xfs_da2_node_tree_p,
>
> .free_hdr_to_disk = xfs_dir2_free_hdr_to_disk,
> .free_hdr_from_disk = xfs_dir2_free_hdr_from_disk,
>
> Is this missing?
Ah. Looks like it snuck into the next patch.
Other than that it looks good.
Reviewed-by: Ben Myers <bpm@xxxxxxx>
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
