[XFS] Make headers compile for more compiler variants; minor cleanup.

SGI-PV: 949432
SGI-Modid: xfs-linux-melb:xfs-kern:25184a

Signed-off-by: Nathan Scott <nathans@sgi.com>

2 files changed, 24 insertions, 27 deletions

diff --git a/fs/xfs/xfs_dir2.h b/fs/xfs/xfs_dir2.h
index 3158f5dc431f..7dd364b1e038 100644
--- a/fs/xfs/xfs_dir2.h
+++ b/fs/xfs/xfs_dir2.h
@@ -55,16 +55,16 @@ typedef	__uint32_t	xfs_dir2_db_t;
 /*
  * Byte offset in a directory.
  */
-typedef xfs_off_t               xfs_dir2_off_t;
+typedef xfs_off_t       xfs_dir2_off_t;
 
 /*
  * For getdents, argument struct for put routines.
  */
 typedef int (*xfs_dir2_put_t)(struct xfs_dir2_put_args *pa);
 typedef struct xfs_dir2_put_args {
-        xfs_off_t               cook;           /* cookie of (next) entry */
+        xfs_off_t       cook;           /* cookie of (next) entry */
         xfs_intino_t    ino;            /* inode number */
-        struct xfs_dirent       *dbp;           /* buffer pointer */
+        xfs_dirent_t    *dbp;           /* buffer pointer */
         char            *name;          /* directory entry name */
         int             namelen;        /* length of name */
         int             done;           /* output: set if value was stored */
@@ -75,18 +75,13 @@ typedef struct xfs_dir2_put_args {
 /*
  * Other interfaces used by the rest of the dir v2 code.
  */
-extern int
-        xfs_dir2_grow_inode(struct xfs_da_args *args, int space,
-                            xfs_dir2_db_t *dbp);
-
-extern int
-        xfs_dir2_isblock(struct xfs_trans *tp, struct xfs_inode *dp, int *vp);
-
-extern int
-        xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp, int *vp);
-
-extern int
-        xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,
-                              struct xfs_dabuf *bp);
+extern int xfs_dir2_grow_inode(struct xfs_da_args *args, int space,
+                                xfs_dir2_db_t *dbp);
+extern int xfs_dir2_isblock(struct xfs_trans *tp, struct xfs_inode *dp,
+                                int *vp);
+extern int xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp,
+                                int *vp);
+extern int xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,
+                                struct xfs_dabuf *bp);
 
 #endif  /* __XFS_DIR2_H__ */
diff --git a/fs/xfs/xfs_dir_sf.h b/fs/xfs/xfs_dir_sf.h
index fe44c6f4d560..5b20b4d3f57d 100644
--- a/fs/xfs/xfs_dir_sf.h
+++ b/fs/xfs/xfs_dir_sf.h
@@ -35,19 +35,21 @@ typedef struct { __uint8_t i[sizeof(xfs_ino_t)]; } xfs_dir_ino_t;
  * and the elements much be memcpy'd out into a work area to get correct
  * alignment for the inode number fields.
  */
+typedef struct xfs_dir_sf_hdr {         /* constant-structure header block */
+        xfs_dir_ino_t   parent;         /* parent dir inode number */
+        __uint8_t       count;          /* count of active entries */
+} xfs_dir_sf_hdr_t;
+
+typedef struct xfs_dir_sf_entry {
+        xfs_dir_ino_t   inumber;        /* referenced inode number */
+        __uint8_t       namelen;        /* actual length of name (no NULL) */
+        __uint8_t       name[1];        /* name */
+} xfs_dir_sf_entry_t;
+
 typedef struct xfs_dir_shortform {
-        struct xfs_dir_sf_hdr {         /* constant-structure header block */
-                xfs_dir_ino_t parent;   /* parent dir inode number */
-                __uint8_t count;        /* count of active entries */
-        } hdr;
-        struct xfs_dir_sf_entry {
-                xfs_dir_ino_t inumber;  /* referenced inode number */
-                __uint8_t namelen;      /* actual length of name (no NULL) */
-                __uint8_t name[1];      /* name */
-        } list[1];                      /* variable sized array */
+        xfs_dir_sf_hdr_t        hdr;
+        xfs_dir_sf_entry_t      list[1];        /* variable sized array */
 } xfs_dir_shortform_t;
-typedef struct xfs_dir_sf_hdr xfs_dir_sf_hdr_t;
-typedef struct xfs_dir_sf_entry xfs_dir_sf_entry_t;
 
 /*
  * We generate this then sort it, so that readdirs are returned in