diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /include/linux/raid | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'include/linux/raid')
| -rw-r--r-- | include/linux/raid/md_k.h | 5 | ||||
| -rw-r--r-- | include/linux/raid/raid0.h | 2 | ||||
| -rw-r--r-- | include/linux/raid/raid1.h | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h index 41d729e16..8c260c63d 100644 --- a/include/linux/raid/md_k.h +++ b/include/linux/raid/md_k.h @@ -59,7 +59,6 @@ typedef struct mdk_rdev_s mdk_rdev_t; #error MD doesnt handle bigger kdev yet #endif -#define MAX_REAL 12 /* Max number of disks per md dev */ #define MAX_MD_DEVS (1<<MINORBITS) /* Max number of md dev */ /* @@ -166,8 +165,7 @@ struct mdk_rdev_s mddev_t *mddev; /* RAID array if running */ unsigned long last_events; /* IO event timestamp */ - struct inode *inode; /* Lock inode */ - struct file filp; /* Lock file */ + struct block_device *bdev; /* block device handle */ mdp_super_t *sb; unsigned long sb_offset; @@ -207,6 +205,7 @@ struct mddev_s struct semaphore reconfig_sem; struct semaphore recovery_sem; struct semaphore resync_sem; + atomic_t active; atomic_t recovery_active; /* blocks scheduled, but not written */ md_wait_queue_head_t recovery_wait; diff --git a/include/linux/raid/raid0.h b/include/linux/raid/raid0.h index a27234f67..0b9372957 100644 --- a/include/linux/raid/raid0.h +++ b/include/linux/raid/raid0.h @@ -9,7 +9,7 @@ struct strip_zone unsigned long dev_offset; /* Zone offset in real dev */ unsigned long size; /* Zone size */ int nb_dev; /* # of devices attached to the zone */ - mdk_rdev_t *dev[MAX_REAL]; /* Devices attached to the zone */ + mdk_rdev_t *dev[MD_SB_DISKS]; /* Devices attached to the zone */ }; struct raid0_hash diff --git a/include/linux/raid/raid1.h b/include/linux/raid/raid1.h index aa17b8472..a9a9d3e8e 100644 --- a/include/linux/raid/raid1.h +++ b/include/linux/raid/raid1.h @@ -7,7 +7,6 @@ struct mirror_info { int number; int raid_disk; kdev_t dev; - int next; int sect_limit; int head_position; |