diff options
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r-- | drivers/md/raid5.c | 30 |
1 files changed, 15 insertions, 15 deletions
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; |