UNIXWARE_PARTITION = 0x63, /* Same as GNU_HURD and SCO Unix */
};
+#ifndef __KERNEL__
+
struct partition {
unsigned char boot_ind; /* 0x80 - active */
unsigned char head; /* starting head */
unsigned int nr_sects; /* nr of sectors in partition */
} __attribute__((packed));
+#endif
+
#ifdef __KERNEL__
+struct partition {
+ unsigned char boot_ind; /* 0x80 - active */
+ unsigned char head; /* starting head */
+ unsigned char sector; /* starting sector */
+ unsigned char cyl; /* starting cylinder */
+ unsigned char sys_ind; /* What partition type */
+ unsigned char end_head; /* end head */
+ unsigned char end_sector; /* end sector */
+ unsigned char end_cyl; /* end cylinder */
+ __le32 start_sect; /* starting sector counting from 0 */
+ __le32 nr_sects; /* nr of sectors in partition */
+} __attribute__((packed));
+
struct hd_struct {
sector_t start_sect;
sector_t nr_sects;
struct timer_rand_state *random;
int policy;
- unsigned sync_io; /* RAID */
+ atomic_t sync_io; /* RAID */
unsigned long stamp, stamp_idle;
int in_flight;
#ifdef CONFIG_SMP
#define SOLARIS_X86_VTOC_SANE (0x600DDEEEUL)
struct solaris_x86_slice {
- ushort s_tag; /* ID tag of partition */
- ushort s_flag; /* permission flags */
- unsigned int s_start; /* start sector no of partition */
- unsigned int s_size; /* # of blocks in partition */
+ __le16 s_tag; /* ID tag of partition */
+ __le16 s_flag; /* permission flags */
+ __le32 s_start; /* start sector no of partition */
+ __le32 s_size; /* # of blocks in partition */
};
struct solaris_x86_vtoc {
unsigned int v_bootinfo[3]; /* info needed by mboot (unsupported) */
- unsigned int v_sanity; /* to verify vtoc sanity */
- unsigned int v_version; /* layout version */
+ __le32 v_sanity; /* to verify vtoc sanity */
+ __le32 v_version; /* layout version */
char v_volume[8]; /* volume name */
- ushort v_sectorsz; /* sector size in bytes */
- ushort v_nparts; /* number of partitions */
+ __le16 v_sectorsz; /* sector size in bytes */
+ __le16 v_nparts; /* number of partitions */
unsigned int v_reserved[10]; /* free space */
struct solaris_x86_slice
v_slice[SOLARIS_X86_NUMSLICE]; /* slice headers */
/* check against BSD src/sys/sys/disklabel.h for consistency */
#define BSD_DISKMAGIC (0x82564557UL) /* The disk magic number */
-#define BSD_MAXPARTITIONS 8
+#define BSD_MAXPARTITIONS 16
#define OPENBSD_MAXPARTITIONS 16
#define BSD_FS_UNUSED 0 /* disklabel unused partition entry ID */
struct bsd_disklabel {
- __u32 d_magic; /* the magic number */
+ __le32 d_magic; /* the magic number */
__s16 d_type; /* drive type */
__s16 d_subtype; /* controller/d_type specific */
char d_typename[16]; /* type name, e.g. "eagle" */
__u32 d_drivedata[NDDATA]; /* drive-type specific information */
#define NSPARE 5
__u32 d_spare[NSPARE]; /* reserved for future use */
- __u32 d_magic2; /* the magic number (again) */
- __u16 d_checksum; /* xor of data incl. partitions */
+ __le32 d_magic2; /* the magic number (again) */
+ __le16 d_checksum; /* xor of data incl. partitions */
/* filesystem and partition information: */
- __u16 d_npartitions; /* number of partitions in following */
- __u32 d_bbsize; /* size of boot area at sn0, bytes */
- __u32 d_sbsize; /* max size of fs superblock, bytes */
+ __le16 d_npartitions; /* number of partitions in following */
+ __le32 d_bbsize; /* size of boot area at sn0, bytes */
+ __le32 d_sbsize; /* max size of fs superblock, bytes */
struct bsd_partition { /* the partition table */
- __u32 p_size; /* number of sectors in partition */
- __u32 p_offset; /* starting sector */
- __u32 p_fsize; /* filesystem basic fragment size */
+ __le32 p_size; /* number of sectors in partition */
+ __le32 p_offset; /* starting sector */
+ __le32 p_fsize; /* filesystem basic fragment size */
__u8 p_fstype; /* filesystem type, see below */
__u8 p_frag; /* filesystem fragments per block */
- __u16 p_cpg; /* filesystem cylinders per group */
+ __le16 p_cpg; /* filesystem cylinders per group */
} d_partitions[BSD_MAXPARTITIONS]; /* actually may be more */
};
#define UNIXWARE_FS_UNUSED 0 /* Unused slice entry ID */
struct unixware_slice {
- __u16 s_label; /* label */
- __u16 s_flags; /* permission flags */
- __u32 start_sect; /* starting sector */
- __u32 nr_sects; /* number of sectors in slice */
+ __le16 s_label; /* label */
+ __le16 s_flags; /* permission flags */
+ __le32 start_sect; /* starting sector */
+ __le32 nr_sects; /* number of sectors in slice */
};
struct unixware_disklabel {
- __u32 d_type; /* drive type */
- __u32 d_magic; /* the magic number */
- __u32 d_version; /* version number */
+ __le32 d_type; /* drive type */
+ __le32 d_magic; /* the magic number */
+ __le32 d_version; /* version number */
char d_serial[12]; /* serial number of the device */
- __u32 d_ncylinders; /* # of data cylinders per device */
- __u32 d_ntracks; /* # of tracks per cylinder */
- __u32 d_nsectors; /* # of data sectors per track */
- __u32 d_secsize; /* # of bytes per sector */
- __u32 d_part_start; /* # of first sector of this partition */
- __u32 d_unknown1[12]; /* ? */
- __u32 d_alt_tbl; /* byte offset of alternate table */
- __u32 d_alt_len; /* byte length of alternate table */
- __u32 d_phys_cyl; /* # of physical cylinders per device */
- __u32 d_phys_trk; /* # of physical tracks per cylinder */
- __u32 d_phys_sec; /* # of physical sectors per track */
- __u32 d_phys_bytes; /* # of physical bytes per sector */
- __u32 d_unknown2; /* ? */
- __u32 d_unknown3; /* ? */
- __u32 d_pad[8]; /* pad */
+ __le32 d_ncylinders; /* # of data cylinders per device */
+ __le32 d_ntracks; /* # of tracks per cylinder */
+ __le32 d_nsectors; /* # of data sectors per track */
+ __le32 d_secsize; /* # of bytes per sector */
+ __le32 d_part_start; /* # of first sector of this partition */
+ __le32 d_unknown1[12]; /* ? */
+ __le32 d_alt_tbl; /* byte offset of alternate table */
+ __le32 d_alt_len; /* byte length of alternate table */
+ __le32 d_phys_cyl; /* # of physical cylinders per device */
+ __le32 d_phys_trk; /* # of physical tracks per cylinder */
+ __le32 d_phys_sec; /* # of physical sectors per track */
+ __le32 d_phys_bytes; /* # of physical bytes per sector */
+ __le32 d_unknown2; /* ? */
+ __le32 d_unknown3; /* ? */
+ __le32 d_pad[8]; /* pad */
struct unixware_vtoc {
- __u32 v_magic; /* the magic number */
- __u32 v_version; /* version number */
+ __le32 v_magic; /* the magic number */
+ __le32 v_version; /* version number */
char v_name[8]; /* volume name */
- __u16 v_nslices; /* # of slices */
- __u16 v_unknown1; /* ? */
- __u32 v_reserved[10]; /* reserved */
+ __le16 v_nslices; /* # of slices */
+ __le16 v_unknown1; /* ? */
+ __le32 v_reserved[10]; /* reserved */
struct unixware_slice
v_slice[UNIXWARE_NUMSLICE]; /* slice headers */
} vtoc;
git://git.onelab.eu / linux-2.6.git / blobdiff