1 files changed, 140 insertions, 149 deletions

diff --git a/fs/hpfs/hpfs.h b/fs/hpfs/hpfs.h
index 8b0650aae328..cce025aff1b1 100644
--- a/fs/hpfs/hpfs.h
+++ b/fs/hpfs/hpfs.h
@@ -51,11 +51,11 @@ struct hpfs_boot_block
   u8 n_rootdir_entries[2];
   u8 n_sectors_s[2];
   u8 media_byte;
-  u16 sectors_per_fat;
-  u16 sectors_per_track;
-  u16 heads_per_cyl;
-  u32 n_hidden_sectors;
-  u32 n_sectors_l;              /* size of partition */
+  __le16 sectors_per_fat;
+  __le16 sectors_per_track;
+  __le16 heads_per_cyl;
+  __le32 n_hidden_sectors;
+  __le32 n_sectors_l;           /* size of partition */
   u8 drive_number;
   u8 mbz;
   u8 sig_28h;                   /* 28h */
@@ -63,7 +63,7 @@ struct hpfs_boot_block
   u8 vol_label[11];
   u8 sig_hpfs[8];               /* "HPFS    " */
   u8 pad[448];
-  u16 magic;                    /* aa55 */
+  __le16 magic;                 /* aa55 */
 };
 
 
@@ -75,28 +75,28 @@ struct hpfs_boot_block
 
 struct hpfs_super_block
 {
-  u32 magic;                            /* f995 e849 */
-  u32 magic1;                           /* fa53 e9c5, more magic? */
+  __le32 magic;                         /* f995 e849 */
+  __le32 magic1;                        /* fa53 e9c5, more magic? */
   u8 version;                           /* version of a filesystem  usually 2 */
   u8 funcversion;                       /* functional version - oldest version
                                            of filesystem that can understand
                                            this disk */
-  u16 zero;                             /* 0 */
-  fnode_secno root;                     /* fnode of root directory */
-  secno n_sectors;                      /* size of filesystem */
-  u32 n_badblocks;                      /* number of bad blocks */
-  secno bitmaps;                        /* pointers to free space bit maps */
-  u32 zero1;                            /* 0 */
-  secno badblocks;                      /* bad block list */
-  u32 zero3;                            /* 0 */
-  time32_t last_chkdsk;                 /* date last checked, 0 if never */
-  time32_t last_optimize;               /* date last optimized, 0 if never */
-  secno n_dir_band;                     /* number of sectors in dir band */
-  secno dir_band_start;                 /* first sector in dir band */
-  secno dir_band_end;                   /* last sector in dir band */
-  secno dir_band_bitmap;                /* free space map, 1 dnode per bit */
+  __le16 zero;                          /* 0 */
+  __le32 root;                          /* fnode of root directory */
+  __le32 n_sectors;                     /* size of filesystem */
+  __le32 n_badblocks;                   /* number of bad blocks */
+  __le32 bitmaps;                       /* pointers to free space bit maps */
+  __le32 zero1;                         /* 0 */
+  __le32 badblocks;                     /* bad block list */
+  __le32 zero3;                         /* 0 */
+  __le32 last_chkdsk;                   /* date last checked, 0 if never */
+  __le32 last_optimize;                 /* date last optimized, 0 if never */
+  __le32 n_dir_band;                    /* number of sectors in dir band */
+  __le32 dir_band_start;                        /* first sector in dir band */
+  __le32 dir_band_end;                  /* last sector in dir band */
+  __le32 dir_band_bitmap;               /* free space map, 1 dnode per bit */
   u8 volume_name[32];                   /* not used */
-  secno user_id_table;                  /* 8 preallocated sectors - user id */
+  __le32 user_id_table;                 /* 8 preallocated sectors - user id */
   u32 zero6[103];                       /* 0 */
 };
 
@@ -109,8 +109,8 @@ struct hpfs_super_block
 
 struct hpfs_spare_block
 {
-  u32 magic;                            /* f991 1849 */
-  u32 magic1;                           /* fa52 29c5, more magic? */
+  __le32 magic;                         /* f991 1849 */
+  __le32 magic1;                                /* fa52 29c5, more magic? */
 
 #ifdef __LITTLE_ENDIAN
   u8 dirty: 1;                          /* 0 clean, 1 "improperly stopped" */
@@ -153,21 +153,21 @@ struct hpfs_spare_block
   u8 mm_contlgulty;
   u8 unused;
 
-  secno hotfix_map;                     /* info about remapped bad sectors */
-  u32 n_spares_used;                    /* number of hotfixes */
-  u32 n_spares;                         /* number of spares in hotfix map */
-  u32 n_dnode_spares_free;              /* spare dnodes unused */
-  u32 n_dnode_spares;                   /* length of spare_dnodes[] list,
+  __le32 hotfix_map;                    /* info about remapped bad sectors */
+  __le32 n_spares_used;                 /* number of hotfixes */
+  __le32 n_spares;                      /* number of spares in hotfix map */
+  __le32 n_dnode_spares_free;           /* spare dnodes unused */
+  __le32 n_dnode_spares;                /* length of spare_dnodes[] list,
                                            follows in this block*/
-  secno code_page_dir;                  /* code page directory block */
-  u32 n_code_pages;                     /* number of code pages */
-  u32 super_crc;                        /* on HPFS386 and LAN Server this is
+  __le32 code_page_dir;                 /* code page directory block */
+  __le32 n_code_pages;                  /* number of code pages */
+  __le32 super_crc;                     /* on HPFS386 and LAN Server this is
                                            checksum of superblock, on normal
                                            OS/2 unused */
-  u32 spare_crc;                        /* on HPFS386 checksum of spareblock */
-  u32 zero1[15];                        /* unused */
-  dnode_secno spare_dnodes[100];        /* emergency free dnode list */
-  u32 zero2[1];                         /* room for more? */
+  __le32 spare_crc;                     /* on HPFS386 checksum of spareblock */
+  __le32 zero1[15];                     /* unused */
+  __le32 spare_dnodes[100];             /* emergency free dnode list */
+  __le32 zero2[1];                      /* room for more? */
 };
 
 /* The bad block list is 4 sectors long.  The first word must be zero,
@@ -202,18 +202,18 @@ struct hpfs_spare_block
 
 struct code_page_directory
 {
-  u32 magic;                            /* 4945 21f7 */
-  u32 n_code_pages;                     /* number of pointers following */
-  u32 zero1[2];
+  __le32 magic;                         /* 4945 21f7 */
+  __le32 n_code_pages;                  /* number of pointers following */
+  __le32 zero1[2];
   struct {
-    u16 ix;                             /* index */
-    u16 code_page_number;               /* code page number */
-    u32 bounds;                         /* matches corresponding word
+    __le16 ix;                          /* index */
+    __le16 code_page_number;            /* code page number */
+    __le32 bounds;                      /* matches corresponding word
                                            in data block */
-    secno code_page_data;               /* sector number of a code_page_data
+    __le32 code_page_data;              /* sector number of a code_page_data
                                            containing c.p. array */
-    u16 index;                          /* index in c.p. array in that sector*/
-    u16 unknown;                        /* some unknown value; usually 0;
+    __le16 index;                       /* index in c.p. array in that sector*/
+    __le16 unknown;                     /* some unknown value; usually 0;
                                            2 in Japanese version */
   } array[31];                          /* unknown length */
 };
@@ -224,19 +224,19 @@ struct code_page_directory
 
 struct code_page_data
 {
-  u32 magic;                            /* 8945 21f7 */
-  u32 n_used;                           /* # elements used in c_p_data[] */
-  u32 bounds[3];                        /* looks a bit like
+  __le32 magic;                         /* 8945 21f7 */
+  __le32 n_used;                        /* # elements used in c_p_data[] */
+  __le32 bounds[3];                     /* looks a bit like
                                              (beg1,end1), (beg2,end2)
                                            one byte each */
-  u16 offs[3];                          /* offsets from start of sector
+  __le16 offs[3];                       /* offsets from start of sector
                                            to start of c_p_data[ix] */
   struct {
-    u16 ix;                             /* index */
-    u16 code_page_number;               /* code page number */
-    u16 unknown;                        /* the same as in cp directory */
+    __le16 ix;                          /* index */
+    __le16 code_page_number;            /* code page number */
+    __le16 unknown;                     /* the same as in cp directory */
     u8 map[128];                        /* upcase table for chars 80..ff */
-    u16 zero2;
+    __le16 zero2;
   } code_page[3];
   u8 incognita[78];
 };
@@ -278,8 +278,8 @@ struct code_page_data
 #define DNODE_MAGIC   0x77e40aae
 
 struct dnode {
-  u32 magic;                            /* 77e4 0aae */
-  u32 first_free;                       /* offset from start of dnode to
+  __le32 magic;                         /* 77e4 0aae */
+  __le32 first_free;                    /* offset from start of dnode to
                                            first free dir entry */
 #ifdef __LITTLE_ENDIAN
   u8 root_dnode: 1;                     /* Is it root dnode? */
@@ -293,14 +293,14 @@ struct dnode {
   u8 root_dnode: 1;                     /* Is it root dnode? */
 #endif
   u8 increment_me2[3];
-  secno up;                             /* (root dnode) directory's fnode
+  __le32 up;                            /* (root dnode) directory's fnode
                                            (nonroot) parent dnode */
-  dnode_secno self;                     /* pointer to this dnode */
+  __le32 self;                  /* pointer to this dnode */
   u8 dirent[2028];                      /* one or more dirents */
 };
 
 struct hpfs_dirent {
-  u16 length;                           /* offset to next dirent */
+  __le16 length;                        /* offset to next dirent */
 
 #ifdef __LITTLE_ENDIAN
   u8 first: 1;                          /* set on phony ^A^A (".") entry */
@@ -346,12 +346,12 @@ struct hpfs_dirent {
   u8 read_only: 1;                      /* dos attrib */
 #endif
 
-  fnode_secno fnode;                    /* fnode giving allocation info */
-  time32_t write_date;                  /* mtime */
-  u32 file_size;                        /* file length, bytes */
-  time32_t read_date;                   /* atime */
-  time32_t creation_date;                       /* ctime */
-  u32 ea_size;                          /* total EA length, bytes */
+  __le32 fnode;                         /* fnode giving allocation info */
+  __le32 write_date;                    /* mtime */
+  __le32 file_size;                     /* file length, bytes */
+  __le32 read_date;                     /* atime */
+  __le32 creation_date;                 /* ctime */
+  __le32 ea_size;                       /* total EA length, bytes */
   u8 no_of_acls;                        /* number of ACL's (low 3 bits) */
   u8 ix;                                /* code page index (of filename), see
                                            struct code_page_data */
@@ -375,50 +375,36 @@ struct hpfs_dirent {
 
 struct bplus_leaf_node
 {
-  u32 file_secno;                       /* first file sector in extent */
-  u32 length;                           /* length, sectors */
-  secno disk_secno;                     /* first corresponding disk sector */
+  __le32 file_secno;                    /* first file sector in extent */
+  __le32 length;                        /* length, sectors */
+  __le32 disk_secno;                    /* first corresponding disk sector */
 };
 
 struct bplus_internal_node
 {
-  u32 file_secno;                       /* subtree maps sectors < this  */
-  anode_secno down;                     /* pointer to subtree */
+  __le32 file_secno;                    /* subtree maps sectors < this  */
+  __le32 down;                          /* pointer to subtree */
 };
 
+enum {
+        BP_hbff = 1,
+        BP_fnode_parent = 0x20,
+        BP_binary_search = 0x40,
+        BP_internal = 0x80
+};
 struct bplus_header
 {
-#ifdef __LITTLE_ENDIAN
-  u8 hbff: 1;                   /* high bit of first free entry offset */
-  u8 flag1234: 4;
-  u8 fnode_parent: 1;                   /* ? we're pointed to by an fnode,
-                                           the data btree or some ea or the
-                                           main ea bootage pointer ea_secno */
-                                        /* also can get set in fnodes, which
-                                           may be a chkdsk glitch or may mean
-                                           this bit is irrelevant in fnodes,
-                                           or this interpretation is all wet */
-  u8 binary_search: 1;                  /* suggest binary search (unused) */
-  u8 internal: 1;                       /* 1 -> (internal) tree of anodes
-                                           0 -> (leaf) list of extents */
-#else
-  u8 internal: 1;                       /* 1 -> (internal) tree of anodes
-                                           0 -> (leaf) list of extents */
-  u8 binary_search: 1;                  /* suggest binary search (unused) */
-  u8 fnode_parent: 1;                   /* ? we're pointed to by an fnode,
+  u8 flags;                             /* bit 0 - high bit of first free entry offset
+                                           bit 5 - we're pointed to by an fnode,
                                            the data btree or some ea or the
-                                           main ea bootage pointer ea_secno */
-                                        /* also can get set in fnodes, which
-                                           may be a chkdsk glitch or may mean
-                                           this bit is irrelevant in fnodes,
-                                           or this interpretation is all wet */
-  u8 flag1234: 4;
-  u8 hbff: 1;                   /* high bit of first free entry offset */
-#endif
+                                           main ea bootage pointer ea_secno
+                                           bit 6 - suggest binary search (unused)
+                                           bit 7 - 1 -> (internal) tree of anodes
+                                                   0 -> (leaf) list of extents */
   u8 fill[3];
   u8 n_free_nodes;                      /* free nodes in following array */
   u8 n_used_nodes;                      /* used nodes in following array */
-  u16 first_free;                       /* offset from start of header to
+  __le16 first_free;                    /* offset from start of header to
                                            first free node in array */
   union {
     struct bplus_internal_node internal[0]; /* (internal) 2-word entries giving
@@ -428,6 +414,16 @@ struct bplus_header
   } u;
 };
 
+static inline bool bp_internal(struct bplus_header *bp)
+{
+        return bp->flags & BP_internal;
+}
+
+static inline bool bp_fnode_parent(struct bplus_header *bp)
+{
+        return bp->flags & BP_fnode_parent;
+}
+
 /* fnode: root of allocation b+ tree, and EA's */
 
 /* Every file and every directory has one fnode, pointed to by the directory
@@ -436,62 +432,56 @@ struct bplus_header
 
 #define FNODE_MAGIC 0xf7e40aae
 
+enum {FNODE_anode = cpu_to_le16(2), FNODE_dir = cpu_to_le16(256)};
 struct fnode
 {
-  u32 magic;                            /* f7e4 0aae */
-  u32 zero1[2];                         /* read history */
+  __le32 magic;                         /* f7e4 0aae */
+  __le32 zero1[2];                      /* read history */
   u8 len, name[15];                     /* true length, truncated name */
-  fnode_secno up;                       /* pointer to file's directory fnode */
-  secno acl_size_l;
-  secno acl_secno;
-  u16 acl_size_s;
+  __le32 up;                            /* pointer to file's directory fnode */
+  __le32 acl_size_l;
+  __le32 acl_secno;
+  __le16 acl_size_s;
   u8 acl_anode;
   u8 zero2;                             /* history bit count */
-  u32 ea_size_l;                        /* length of disk-resident ea's */
-  secno ea_secno;                       /* first sector of disk-resident ea's*/
-  u16 ea_size_s;                        /* length of fnode-resident ea's */
-
-#ifdef __LITTLE_ENDIAN
-  u8 flag0: 1;
-  u8 ea_anode: 1;                       /* 1 -> ea_secno is an anode */
-  u8 flag234567: 6;
-#else
-  u8 flag234567: 6;
-  u8 ea_anode: 1;                       /* 1 -> ea_secno is an anode */
-  u8 flag0: 1;
-#endif
+  __le32 ea_size_l;                     /* length of disk-resident ea's */
+  __le32 ea_secno;                      /* first sector of disk-resident ea's*/
+  __le16 ea_size_s;                     /* length of fnode-resident ea's */
 
-#ifdef __LITTLE_ENDIAN
-  u8 dirflag: 1;                        /* 1 -> directory.  first & only extent
-                                           points to dnode. */
-  u8 flag9012345: 7;
-#else
-  u8 flag9012345: 7;
-  u8 dirflag: 1;                        /* 1 -> directory.  first & only extent
+  __le16 flags;                         /* bit 1 set -> ea_secno is an anode */
+                                        /* bit 8 set -> directory.  first & only extent
                                            points to dnode. */
-#endif
-
   struct bplus_header btree;            /* b+ tree, 8 extents or 12 subtrees */
   union {
     struct bplus_leaf_node external[8];
     struct bplus_internal_node internal[12];
   } u;
 
-  u32 file_size;                        /* file length, bytes */
-  u32 n_needea;                         /* number of EA's with NEEDEA set */
+  __le32 file_size;                     /* file length, bytes */
+  __le32 n_needea;                      /* number of EA's with NEEDEA set */
   u8 user_id[16];                       /* unused */
-  u16 ea_offs;                          /* offset from start of fnode
+  __le16 ea_offs;                       /* offset from start of fnode
                                            to first fnode-resident ea */
   u8 dasd_limit_treshhold;
   u8 dasd_limit_delta;
-  u32 dasd_limit;
-  u32 dasd_usage;
+  __le32 dasd_limit;
+  __le32 dasd_usage;
   u8 ea[316];                           /* zero or more EA's, packed together
                                            with no alignment padding.
                                            (Do not use this name, get here
                                            via fnode + ea_offs. I think.) */
 };
 
+static inline bool fnode_in_anode(struct fnode *p)
+{
+        return (p->flags & FNODE_anode) != 0;
+}
+
+static inline bool fnode_is_dir(struct fnode *p)
+{
+        return (p->flags & FNODE_dir) != 0;
+}
+
 
 /* anode: 99.44% pure allocation tree */
 
@@ -499,9 +489,9 @@ struct fnode
 
 struct anode
 {
-  u32 magic;                            /* 37e4 0aae */
-  anode_secno self;                     /* pointer to this anode */
-  secno up;                             /* parent anode or fnode */
+  __le32 magic;                         /* 37e4 0aae */
+  __le32 self;                          /* pointer to this anode */
+  __le32 up;                            /* parent anode or fnode */
 
   struct bplus_header btree;            /* b+tree, 40 extents or 60 subtrees */
   union {
@@ -509,7 +499,7 @@ struct anode
     struct bplus_internal_node internal[60];
   } u;
 
-  u32 fill[3];                          /* unused */
+  __le32 fill[3];                       /* unused */
 };
 
 
@@ -528,32 +518,23 @@ struct anode
    run, or in multiple runs.  Flags in the fnode tell whether the EA list
    is immediate, in a single run, or in multiple runs. */
 
+enum {EA_indirect = 1, EA_anode = 2, EA_needea = 128 };
 struct extended_attribute
 {
-#ifdef __LITTLE_ENDIAN
-  u8 indirect: 1;                       /* 1 -> value gives sector number
+  u8 flags;                             /* bit 0 set -> value gives sector number
                                            where real value starts */
-  u8 anode: 1;                          /* 1 -> sector is an anode
+                                        /* bit 1 set -> sector is an anode
                                            that points to fragmented value */
-  u8 flag23456: 5;
-  u8 needea: 1;                         /* required ea */
-#else
-  u8 needea: 1;                         /* required ea */
-  u8 flag23456: 5;
-  u8 anode: 1;                          /* 1 -> sector is an anode
-                                           that points to fragmented value */
-  u8 indirect: 1;                       /* 1 -> value gives sector number
-                                           where real value starts */
-#endif
+                                        /* bit 7 set -> required ea */
   u8 namelen;                           /* length of name, bytes */
   u8 valuelen_lo;                       /* length of value, bytes */
   u8 valuelen_hi;                       /* length of value, bytes */
-  u8 name[0];
+  u8 name[];
   /*
     u8 name[namelen];                   ascii attrib name
     u8 nul;                             terminating '\0', not counted
     u8 value[valuelen];                 value, arbitrary
-      if this.indirect, valuelen is 8 and the value is
+      if this.flags & 1, valuelen is 8 and the value is
         u32 length;                     real length of value, bytes
         secno secno;                    sector address where it starts
       if this.anode, the above sector number is the root of an anode tree
@@ -561,6 +542,16 @@ struct extended_attribute
   */
 };
 
+static inline bool ea_indirect(struct extended_attribute *ea)
+{
+        return ea->flags & EA_indirect;
+}
+
+static inline bool ea_in_anode(struct extended_attribute *ea)
+{
+        return ea->flags & EA_anode;
+}
+
 /*
    Local Variables:
    comment-column: 40