vserver 1.9.5.x5

[linux-2.6.git] / include / linux / efs_vh.h

diff --git a/include/linux/efs_vh.h b/include/linux/efs_vh.h
index b9d7e4d..8a11150 100644 (file)
--- a/include/linux/efs_vh.h
+++ b/include/linux/efs_vh.h
@@ -17,26 +17,26 @@
 
 struct volume_directory {
        char    vd_name[VDNAMESIZE];    /* name */
-       int     vd_lbn;                 /* logical block number */
-       int     vd_nbytes;              /* file length in bytes */
+       __be32  vd_lbn;                 /* logical block number */
+       __be32  vd_nbytes;              /* file length in bytes */
 };
 
 struct partition_table {       /* one per logical partition */
-       int     pt_nblks;       /* # of logical blks in partition */
-       int     pt_firstlbn;    /* first lbn of partition */
-       int     pt_type;        /* use of partition */
+       __be32  pt_nblks;       /* # of logical blks in partition */
+       __be32  pt_firstlbn;    /* first lbn of partition */
+       __be32  pt_type;        /* use of partition */
 };
 
 struct volume_header {
-       int     vh_magic;                       /* identifies volume header */
-       short   vh_rootpt;                      /* root partition number */
-       short   vh_swappt;                      /* swap partition number */
+       __be32  vh_magic;                       /* identifies volume header */
+       __be16  vh_rootpt;                      /* root partition number */
+       __be16  vh_swappt;                      /* swap partition number */
        char    vh_bootfile[BFNAMESIZE];        /* name of file to boot */
        char    pad[48];                        /* device param space */
        struct volume_directory vh_vd[NVDIR];   /* other vol hdr contents */
        struct partition_table  vh_pt[NPARTAB]; /* device partition layout */
-       int     vh_csum;                        /* volume header checksum */
-       int     vh_fill;                        /* fill out to 512 bytes */
+       __be32  vh_csum;                        /* volume header checksum */
+       __be32  vh_fill;                        /* fill out to 512 bytes */
 };
 
 /* partition type sysv is used for EFS format CD-ROM partitions */
@@ -47,23 +47,6 @@ struct volume_header {
 struct pt_types {
        int     pt_type;
        char    *pt_name;
-} sgi_pt_types[] = {
-       {0x00,          "SGI vh"},
-       {0x01,          "SGI trkrepl"},
-       {0x02,          "SGI secrepl"},
-       {0x03,          "SGI raw"},
-       {0x04,          "SGI bsd"},
-       {SGI_SYSV,      "SGI sysv"},
-       {0x06,          "SGI vol"},
-       {SGI_EFS,       "SGI efs"},
-       {0x08,          "SGI lv"},
-       {0x09,          "SGI rlv"},
-       {0x0A,          "SGI xfs"},
-       {0x0B,          "SGI xfslog"},
-       {0x0C,          "SGI xlv"},
-       {0x82,          "Linux swap"},
-       {0x83,          "Linux native"},
-       {0,             NULL}
 };
 
 #endif /* __EFS_VH_H__ */