diff options
-rw-r--r-- | drivers/md/md.c | 26 | ||||
-rw-r--r-- | drivers/md/raid5.c | 30 | ||||
-rw-r--r-- | include/linux/raid/md.h | 10 |
3 files changed, 33 insertions, 33 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 | ||
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 7e654543c97d..d72be4b89e64 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -270,7 +270,7 @@ static int grow_buffers(struct stripe_head *sh, int num) | |||
270 | return 0; | 270 | return 0; |
271 | } | 271 | } |
272 | 272 | ||
273 | static void raid5_build_block (struct stripe_head *sh, int i); | 273 | static void raid5_build_block(struct stripe_head *sh, int i); |
274 | 274 | ||
275 | static void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx, int disks) | 275 | static void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx, int disks) |
276 | { | 276 | { |
@@ -1146,7 +1146,7 @@ static void raid5_end_read_request(struct bio * bi, int error) | |||
1146 | release_stripe(sh); | 1146 | release_stripe(sh); |
1147 | } | 1147 | } |
1148 | 1148 | ||
1149 | static void raid5_end_write_request (struct bio *bi, int error) | 1149 | static void raid5_end_write_request(struct bio *bi, int error) |
1150 | { | 1150 | { |
1151 | struct stripe_head *sh = bi->bi_private; | 1151 | struct stripe_head *sh = bi->bi_private; |
1152 | raid5_conf_t *conf = sh->raid_conf; | 1152 | raid5_conf_t *conf = sh->raid_conf; |
@@ -1178,7 +1178,7 @@ static void raid5_end_write_request (struct bio *bi, int error) | |||
1178 | 1178 | ||
1179 | static sector_t compute_blocknr(struct stripe_head *sh, int i); | 1179 | static sector_t compute_blocknr(struct stripe_head *sh, int i); |
1180 | 1180 | ||
1181 | static void raid5_build_block (struct stripe_head *sh, int i) | 1181 | static void raid5_build_block(struct stripe_head *sh, int i) |
1182 | { | 1182 | { |
1183 | struct r5dev *dev = &sh->dev[i]; | 1183 | struct r5dev *dev = &sh->dev[i]; |
1184 | 1184 | ||
@@ -1216,10 +1216,10 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev) | |||
1216 | set_bit(MD_RECOVERY_INTR, &mddev->recovery); | 1216 | set_bit(MD_RECOVERY_INTR, &mddev->recovery); |
1217 | } | 1217 | } |
1218 | set_bit(Faulty, &rdev->flags); | 1218 | set_bit(Faulty, &rdev->flags); |
1219 | printk (KERN_ALERT | 1219 | printk(KERN_ALERT |
1220 | "raid5: Disk failure on %s, disabling device.\n" | 1220 | "raid5: Disk failure on %s, disabling device.\n" |
1221 | "raid5: Operation continuing on %d devices.\n", | 1221 | "raid5: Operation continuing on %d devices.\n", |
1222 | bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded); | 1222 | bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded); |
1223 | } | 1223 | } |
1224 | } | 1224 | } |
1225 | 1225 | ||
@@ -1315,8 +1315,8 @@ static sector_t raid5_compute_sector(sector_t r_sector, unsigned int raid_disks, | |||
1315 | *dd_idx = (*pd_idx + 2 + *dd_idx) % raid_disks; | 1315 | *dd_idx = (*pd_idx + 2 + *dd_idx) % raid_disks; |
1316 | break; | 1316 | break; |
1317 | default: | 1317 | default: |
1318 | printk (KERN_CRIT "raid6: unsupported algorithm %d\n", | 1318 | printk(KERN_CRIT "raid6: unsupported algorithm %d\n", |
1319 | conf->algorithm); | 1319 | conf->algorithm); |
1320 | } | 1320 | } |
1321 | break; | 1321 | break; |
1322 | } | 1322 | } |
@@ -1391,8 +1391,8 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i) | |||
1391 | } | 1391 | } |
1392 | break; | 1392 | break; |
1393 | default: | 1393 | default: |
1394 | printk (KERN_CRIT "raid6: unsupported algorithm %d\n", | 1394 | printk(KERN_CRIT "raid6: unsupported algorithm %d\n", |
1395 | conf->algorithm); | 1395 | conf->algorithm); |
1396 | } | 1396 | } |
1397 | break; | 1397 | break; |
1398 | } | 1398 | } |
@@ -1400,7 +1400,7 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i) | |||
1400 | chunk_number = stripe * data_disks + i; | 1400 | chunk_number = stripe * data_disks + i; |
1401 | r_sector = (sector_t)chunk_number * sectors_per_chunk + chunk_offset; | 1401 | r_sector = (sector_t)chunk_number * sectors_per_chunk + chunk_offset; |
1402 | 1402 | ||
1403 | check = raid5_compute_sector (r_sector, raid_disks, data_disks, &dummy1, &dummy2, conf); | 1403 | check = raid5_compute_sector(r_sector, raid_disks, data_disks, &dummy1, &dummy2, conf); |
1404 | if (check != sh->sector || dummy1 != dd_idx || dummy2 != sh->pd_idx) { | 1404 | if (check != sh->sector || dummy1 != dd_idx || dummy2 != sh->pd_idx) { |
1405 | printk(KERN_ERR "compute_blocknr: map not correct\n"); | 1405 | printk(KERN_ERR "compute_blocknr: map not correct\n"); |
1406 | return 0; | 1406 | return 0; |
@@ -4284,7 +4284,7 @@ static int stop(mddev_t *mddev) | |||
4284 | } | 4284 | } |
4285 | 4285 | ||
4286 | #ifdef DEBUG | 4286 | #ifdef DEBUG |
4287 | static void print_sh (struct seq_file *seq, struct stripe_head *sh) | 4287 | static void print_sh(struct seq_file *seq, struct stripe_head *sh) |
4288 | { | 4288 | { |
4289 | int i; | 4289 | int i; |
4290 | 4290 | ||
@@ -4300,7 +4300,7 @@ static void print_sh (struct seq_file *seq, struct stripe_head *sh) | |||
4300 | seq_printf(seq, "\n"); | 4300 | seq_printf(seq, "\n"); |
4301 | } | 4301 | } |
4302 | 4302 | ||
4303 | static void printall (struct seq_file *seq, raid5_conf_t *conf) | 4303 | static void printall(struct seq_file *seq, raid5_conf_t *conf) |
4304 | { | 4304 | { |
4305 | struct stripe_head *sh; | 4305 | struct stripe_head *sh; |
4306 | struct hlist_node *hn; | 4306 | struct hlist_node *hn; |
@@ -4318,7 +4318,7 @@ static void printall (struct seq_file *seq, raid5_conf_t *conf) | |||
4318 | } | 4318 | } |
4319 | #endif | 4319 | #endif |
4320 | 4320 | ||
4321 | static void status (struct seq_file *seq, mddev_t *mddev) | 4321 | static void status(struct seq_file *seq, mddev_t *mddev) |
4322 | { | 4322 | { |
4323 | raid5_conf_t *conf = (raid5_conf_t *) mddev->private; | 4323 | raid5_conf_t *conf = (raid5_conf_t *) mddev->private; |
4324 | int i; | 4324 | int i; |
diff --git a/include/linux/raid/md.h b/include/linux/raid/md.h index bb727fa1ce7f..82bea14cae1a 100644 --- a/include/linux/raid/md.h +++ b/include/linux/raid/md.h | |||
@@ -54,17 +54,17 @@ | |||
54 | 54 | ||
55 | extern int mdp_major; | 55 | extern int mdp_major; |
56 | 56 | ||
57 | extern int register_md_personality (struct mdk_personality *p); | 57 | extern int register_md_personality(struct mdk_personality *p); |
58 | extern int unregister_md_personality (struct mdk_personality *p); | 58 | extern int unregister_md_personality(struct mdk_personality *p); |
59 | extern mdk_thread_t * md_register_thread (void (*run) (mddev_t *mddev), | 59 | extern mdk_thread_t * md_register_thread(void (*run) (mddev_t *mddev), |
60 | mddev_t *mddev, const char *name); | 60 | mddev_t *mddev, const char *name); |
61 | extern void md_unregister_thread (mdk_thread_t *thread); | 61 | extern void md_unregister_thread(mdk_thread_t *thread); |
62 | extern void md_wakeup_thread(mdk_thread_t *thread); | 62 | extern void md_wakeup_thread(mdk_thread_t *thread); |
63 | extern void md_check_recovery(mddev_t *mddev); | 63 | extern void md_check_recovery(mddev_t *mddev); |
64 | extern void md_write_start(mddev_t *mddev, struct bio *bi); | 64 | extern void md_write_start(mddev_t *mddev, struct bio *bi); |
65 | extern void md_write_end(mddev_t *mddev); | 65 | extern void md_write_end(mddev_t *mddev); |
66 | extern void md_done_sync(mddev_t *mddev, int blocks, int ok); | 66 | extern void md_done_sync(mddev_t *mddev, int blocks, int ok); |
67 | extern void md_error (mddev_t *mddev, mdk_rdev_t *rdev); | 67 | extern void md_error(mddev_t *mddev, mdk_rdev_t *rdev); |
68 | 68 | ||
69 | extern void md_super_write(mddev_t *mddev, mdk_rdev_t *rdev, | 69 | extern void md_super_write(mddev_t *mddev, mdk_rdev_t *rdev, |
70 | sector_t sector, int size, struct page *page); | 70 | sector_t sector, int size, struct page *page); |