diff options
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index cd97de5982e8..a29187d1fcf5 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -55,7 +55,7 @@ | |||
55 | 55 | ||
56 | 56 | ||
57 | #ifndef MODULE | 57 | #ifndef MODULE |
58 | static void autostart_arrays (int part); | 58 | static void autostart_arrays(int part); |
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | static LIST_HEAD(pers_list); | 61 | static LIST_HEAD(pers_list); |
@@ -201,7 +201,7 @@ static DEFINE_SPINLOCK(all_mddevs_lock); | |||
201 | ) | 201 | ) |
202 | 202 | ||
203 | 203 | ||
204 | static int md_fail_request (struct request_queue *q, struct bio *bio) | 204 | static int md_fail_request(struct request_queue *q, struct bio *bio) |
205 | { | 205 | { |
206 | bio_io_error(bio); | 206 | bio_io_error(bio); |
207 | return 0; | 207 | return 0; |
@@ -3962,10 +3962,10 @@ static void autorun_array(mddev_t *mddev) | |||
3962 | } | 3962 | } |
3963 | printk("\n"); | 3963 | printk("\n"); |
3964 | 3964 | ||
3965 | err = do_md_run (mddev); | 3965 | err = do_md_run(mddev); |
3966 | if (err) { | 3966 | if (err) { |
3967 | printk(KERN_WARNING "md: do_md_run() returned %d\n", err); | 3967 | printk(KERN_WARNING "md: do_md_run() returned %d\n", err); |
3968 | do_md_stop (mddev, 0, 0); | 3968 | do_md_stop(mddev, 0, 0); |
3969 | } | 3969 | } |
3970 | } | 3970 | } |
3971 | 3971 | ||
@@ -4324,7 +4324,7 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info) | |||
4324 | 4324 | ||
4325 | if (!(info->state & (1<<MD_DISK_FAULTY))) { | 4325 | if (!(info->state & (1<<MD_DISK_FAULTY))) { |
4326 | int err; | 4326 | int err; |
4327 | rdev = md_import_device (dev, -1, 0); | 4327 | rdev = md_import_device(dev, -1, 0); |
4328 | if (IS_ERR(rdev)) { | 4328 | if (IS_ERR(rdev)) { |
4329 | printk(KERN_WARNING | 4329 | printk(KERN_WARNING |
4330 | "md: error, md_import_device() returned %ld\n", | 4330 | "md: error, md_import_device() returned %ld\n", |
@@ -4406,7 +4406,7 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev) | |||
4406 | return -EINVAL; | 4406 | return -EINVAL; |
4407 | } | 4407 | } |
4408 | 4408 | ||
4409 | rdev = md_import_device (dev, -1, 0); | 4409 | rdev = md_import_device(dev, -1, 0); |
4410 | if (IS_ERR(rdev)) { | 4410 | if (IS_ERR(rdev)) { |
4411 | printk(KERN_WARNING | 4411 | printk(KERN_WARNING |
4412 | "md: error, md_import_device() returned %ld\n", | 4412 | "md: error, md_import_device() returned %ld\n", |
@@ -4925,11 +4925,11 @@ static int md_ioctl(struct inode *inode, struct file *file, | |||
4925 | goto done_unlock; | 4925 | goto done_unlock; |
4926 | 4926 | ||
4927 | case STOP_ARRAY: | 4927 | case STOP_ARRAY: |
4928 | err = do_md_stop (mddev, 0, 1); | 4928 | err = do_md_stop(mddev, 0, 1); |
4929 | goto done_unlock; | 4929 | goto done_unlock; |
4930 | 4930 | ||
4931 | case STOP_ARRAY_RO: | 4931 | case STOP_ARRAY_RO: |
4932 | err = do_md_stop (mddev, 1, 1); | 4932 | err = do_md_stop(mddev, 1, 1); |
4933 | goto done_unlock; | 4933 | goto done_unlock; |
4934 | 4934 | ||
4935 | } | 4935 | } |
@@ -4978,7 +4978,7 @@ static int md_ioctl(struct inode *inode, struct file *file, | |||
4978 | goto done_unlock; | 4978 | goto done_unlock; |
4979 | 4979 | ||
4980 | case RUN_ARRAY: | 4980 | case RUN_ARRAY: |
4981 | err = do_md_run (mddev); | 4981 | err = do_md_run(mddev); |
4982 | goto done_unlock; | 4982 | goto done_unlock; |
4983 | 4983 | ||
4984 | case SET_BITMAP_FILE: | 4984 | case SET_BITMAP_FILE: |
@@ -5416,11 +5416,11 @@ static int md_seq_show(struct seq_file *seq, void *v) | |||
5416 | seq_printf(seq, " super non-persistent"); | 5416 | seq_printf(seq, " super non-persistent"); |
5417 | 5417 | ||
5418 | if (mddev->pers) { | 5418 | if (mddev->pers) { |
5419 | mddev->pers->status (seq, mddev); | 5419 | mddev->pers->status(seq, mddev); |
5420 | seq_printf(seq, "\n "); | 5420 | seq_printf(seq, "\n "); |
5421 | if (mddev->pers->sync_request) { | 5421 | if (mddev->pers->sync_request) { |
5422 | if (mddev->curr_resync > 2) { | 5422 | if (mddev->curr_resync > 2) { |
5423 | status_resync (seq, mddev); | 5423 | status_resync(seq, mddev); |
5424 | seq_printf(seq, "\n "); | 5424 | seq_printf(seq, "\n "); |
5425 | } else if (mddev->curr_resync == 1 || mddev->curr_resync == 2) | 5425 | } else if (mddev->curr_resync == 1 || mddev->curr_resync == 2) |
5426 | seq_printf(seq, "\tresync=DELAYED\n "); | 5426 | seq_printf(seq, "\tresync=DELAYED\n "); |
@@ -6251,7 +6251,7 @@ static int md_notify_reboot(struct notifier_block *this, | |||
6251 | * appears to still be in use. Hence | 6251 | * appears to still be in use. Hence |
6252 | * the '100'. | 6252 | * the '100'. |
6253 | */ | 6253 | */ |
6254 | do_md_stop (mddev, 1, 100); | 6254 | do_md_stop(mddev, 1, 100); |
6255 | mddev_unlock(mddev); | 6255 | mddev_unlock(mddev); |
6256 | } | 6256 | } |
6257 | /* | 6257 | /* |
@@ -6295,7 +6295,7 @@ static int __init md_init(void) | |||
6295 | raid_table_header = register_sysctl_table(raid_root_table); | 6295 | raid_table_header = register_sysctl_table(raid_root_table); |
6296 | 6296 | ||
6297 | md_geninit(); | 6297 | md_geninit(); |
6298 | return (0); | 6298 | return 0; |
6299 | } | 6299 | } |
6300 | 6300 | ||
6301 | 6301 | ||