diff options
| -rw-r--r-- | drivers/md/md.c | 4 | ||||
| -rw-r--r-- | drivers/md/raid0.c | 3 | ||||
| -rw-r--r-- | drivers/md/raid10.c | 2 | ||||
| -rw-r--r-- | drivers/md/raid5.c | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index a307f87eb90e..0a16dae44e40 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -3816,7 +3816,7 @@ static int do_md_run(mddev_t * mddev) /* Warn if this is a potentially silly * configuration. */ - char b[BDEVNAME_SIZE], b2[BDEVNAME_SIZE]; + char b2[BDEVNAME_SIZE]; mdk_rdev_t *rdev2; int warned = 0; @@ -4424,7 +4424,7 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info) if (!list_empty(&mddev->disks)) { mdk_rdev_t *rdev0 = list_entry(mddev->disks.next, mdk_rdev_t, same_set); - int err = super_types[mddev->major_version] + err = super_types[mddev->major_version] .load_super(rdev, rdev0, mddev->minor_version); if (err < 0) { printk(KERN_WARNING diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index c605ba805586..fc4cae73e542 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c @@ -120,7 +120,7 @@ static int create_strip_zones (mddev_t *mddev) smallest = NULL; zone->dev = conf->devlist; list_for_each_entry(rdev1, &mddev->disks, same_set) { - int j = rdev1->raid_disk; + j = rdev1->raid_disk; if (j < 0 || j >= mddev->raid_disks) { printk(KERN_ERR "raid0: bad disk number %d - " @@ -173,7 +173,6 @@ static int create_strip_zones (mddev_t *mddev) c = 0; for (j=0; j<cnt; j++) { - char b[BDEVNAME_SIZE]; rdev = conf->strip_zone[0].dev[j]; printk(KERN_INFO "raid0: checking %s ...", bdevname(rdev->bdev, b)); diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 7301631abe04..c6d9b415dc98 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -1768,7 +1768,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i max_sync = RESYNC_PAGES << (PAGE_SHIFT-9); if (!test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) { /* recovery... the complicated one */ - int i, j, k; + int j, k; r10_bio = NULL; for (i=0 ; i<conf->raid_disks; i++) diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index a5ba080d303b..fb4319f414df 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -2564,7 +2564,7 @@ static bool handle_stripe5(struct stripe_head *sh) rcu_read_lock(); for (i=disks; i--; ) { mdk_rdev_t *rdev; - struct r5dev *dev = &sh->dev[i]; + dev = &sh->dev[i]; clear_bit(R5_Insync, &dev->flags); pr_debug("check %d: state 0x%lx toread %p read %p write %p " |