diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /drivers/md | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/md.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 4e82a5814..c89314c78 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -60,7 +60,7 @@ extern asmlinkage long sys_setsid(void); # define dprintk(x...) do { } while(0) #endif -static mdk_personality_t *pers[MAX_PERSONALITY] = {NULL, }; +static mdk_personality_t *pers[MAX_PERSONALITY]; /* * Current RAID-1,4,5 parallel reconstruction 'guaranteed speed limit' @@ -105,12 +105,12 @@ struct hd_struct md_hd_struct[MAX_MD_DEVS]; static int md_blocksizes[MAX_MD_DEVS]; static int md_hardsect_sizes[MAX_MD_DEVS]; static int md_maxreadahead[MAX_MD_DEVS]; -static mdk_thread_t *md_recovery_thread = NULL; +static mdk_thread_t *md_recovery_thread; -int md_size[MAX_MD_DEVS] = {0, }; +int md_size[MAX_MD_DEVS]; extern struct block_device_operations md_fops; -static devfs_handle_t devfs_handle = NULL; +static devfs_handle_t devfs_handle; static struct gendisk md_gendisk= { @@ -136,7 +136,7 @@ static MD_LIST_HEAD(all_mddevs); * one! Eg. HSM uses several sub-devices to implement Logical * Volumes. All these sub-devices map to the same mddev. */ -dev_mapping_t mddev_map [MAX_MD_DEVS] = { {NULL, 0}, }; +dev_mapping_t mddev_map[MAX_MD_DEVS]; void add_mddev_mapping (mddev_t * mddev, kdev_t dev, void *data) { @@ -2032,7 +2032,7 @@ void md_setup_drive(void) md__init; * at boot time. */ #ifdef CONFIG_AUTODETECT_RAID -static int detected_devices[128] md__initdata; +static int detected_devices[128] md__initdata = { 0, }; static int dev_cnt=0; void md_autodetect_dev(kdev_t dev) { @@ -3640,7 +3640,7 @@ struct { int pers[MAX_MD_BOOT_DEVS]; int chunk[MAX_MD_BOOT_DEVS]; kdev_t devices[MAX_MD_BOOT_DEVS][MAX_REAL]; -} md_setup_args md__initdata; +} md_setup_args md__initdata = { 0, }; /* * Parse the command-line parameters given our kernel, but do not |