[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>

1 files changed, 13 insertions, 11 deletions

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