diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-23 14:05:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-23 14:05:01 +0000 |
| commit | f3627cbe9236a062012c836f3b6ee311b43f63f2 (patch) | |
| tree | ae854838b9a73b35bd0f3b8f42e5fb7f9cb1d5a9 /include/linux/raid | |
| parent | fea12a7b3f20bc135ab533491411e9ff753c01c8 (diff) | |
Merge with Linux 2.4.0-test5-pre4.
Diffstat (limited to 'include/linux/raid')
| -rw-r--r-- | include/linux/raid/md.h | 3 | ||||
| -rw-r--r-- | include/linux/raid/md_p.h | 15 |
2 files changed, 13 insertions, 5 deletions
diff --git a/include/linux/raid/md.h b/include/linux/raid/md.h index b36a7ce01..7aef27bca 100644 --- a/include/linux/raid/md.h +++ b/include/linux/raid/md.h @@ -19,7 +19,6 @@ #define _MD_H #include <linux/mm.h> -#include <linux/config.h> #include <linux/fs.h> #include <linux/blkdev.h> #include <asm/semaphore.h> @@ -84,8 +83,6 @@ extern int md_notify_reboot(struct notifier_block *this, unsigned long code, void *x); extern int md_error (kdev_t mddev, kdev_t rdev); -extern void raid_setup(char *str) md__init; - extern void md_print_devices (void); #define MD_BUG(x...) { printk("md: bug in file %s, line %d\n", __FILE__, __LINE__); md_print_devices(); } diff --git a/include/linux/raid/md_p.h b/include/linux/raid/md_p.h index 1b9632c14..0c6e1a368 100644 --- a/include/linux/raid/md_p.h +++ b/include/linux/raid/md_p.h @@ -115,7 +115,7 @@ typedef struct mdp_superblock_s { __u32 not_persistent; /* 12 does it have a persistent superblock */ __u32 set_uuid1; /* 13 Raid set identifier #2 */ __u32 set_uuid2; /* 14 Raid set identifier #3 */ - __u32 set_uuid3; /* 14 Raid set identifier #4 */ + __u32 set_uuid3; /* 15 Raid set identifier #4 */ __u32 gstate_creserved[MD_SB_GENERIC_CONSTANT_WORDS - 16]; /* @@ -128,7 +128,13 @@ typedef struct mdp_superblock_s { __u32 failed_disks; /* 4 Number of failed disks */ __u32 spare_disks; /* 5 Number of spare disks */ __u32 sb_csum; /* 6 checksum of the whole superblock */ - __u64 events; /* 7 number of superblock updates (64-bit!) */ +#ifdef __BIG_ENDIAN + __u32 events_hi; /* 7 high-order of superblock update count */ + __u32 events_lo; /* 8 low-order of superblock update count */ +#else + __u32 events_lo; /* 7 low-order of superblock update count */ + __u32 events_hi; /* 8 high-order of superblock update count */ +#endif __u32 gstate_sreserved[MD_SB_GENERIC_STATE_WORDS - 9]; /* @@ -157,5 +163,10 @@ typedef struct mdp_superblock_s { } mdp_super_t; +static inline __u64 md_event(mdp_super_t *sb) { + __u64 ev = sb->events_hi; + return (ev<<32)| sb->events_lo; +} + #endif _MD_P_H |