xfs: convert directory vector functions to constants

Many of the vectorised function calls now take no parameters and
return a constant value. There is no reason for these to be vectored
functions, so convert them to constants

Binary sizes:

   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
 791701   96802    1096  889599   d92ff fs/xfs/xfs.o.p8
 791205   96802    1096  889103   d91cf fs/xfs/xfs.o.p9

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, 7 insertions, 7 deletions

diff --git a/fs/xfs/xfs_dir2.h b/fs/xfs/xfs_dir2.h
index 4264cb9199f8..cec70e0781ab 100644
--- a/fs/xfs/xfs_dir2.h
+++ b/fs/xfs/xfs_dir2.h
@@ -59,10 +59,10 @@ struct xfs_dir_ops {
         struct xfs_dir2_data_free *
                 (*data_bestfree_p)(struct xfs_dir2_data_hdr *hdr);
 
-        xfs_dir2_data_aoff_t (*data_dot_offset)(void);
-        xfs_dir2_data_aoff_t (*data_dotdot_offset)(void);
-        xfs_dir2_data_aoff_t (*data_first_offset)(void);
-        size_t  (*data_entry_offset)(void);
+        xfs_dir2_data_aoff_t data_dot_offset;
+        xfs_dir2_data_aoff_t data_dotdot_offset;
+        xfs_dir2_data_aoff_t data_first_offset;
+        size_t  data_entry_offset;
 
         struct xfs_dir2_data_entry *
                 (*data_dot_entry_p)(struct xfs_dir2_data_hdr *hdr);
@@ -75,7 +75,7 @@ struct xfs_dir_ops {
         struct xfs_dir2_data_unused *
                 (*data_unused_p)(struct xfs_dir2_data_hdr *hdr);
 
-        int     (*leaf_hdr_size)(void);
+        int     leaf_hdr_size;
         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,
@@ -84,7 +84,7 @@ struct xfs_dir_ops {
         struct xfs_dir2_leaf_entry *
                 (*leaf_ents_p)(struct xfs_dir2_leaf *lp);
 
-        int     (*node_hdr_size)(void);
+        int     node_hdr_size;
         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,
@@ -92,7 +92,7 @@ struct xfs_dir_ops {
         struct xfs_da_node_entry *
                 (*node_tree_p)(struct xfs_da_intnode *dap);
 
-        int     (*free_hdr_size)(void);
+        int     free_hdr_size;
         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,