md: remove sparse waring "symbol xxx shadows an earlier one"
Rename some variable and remove some duplicate definitions to avoid there warnings. None of them are actual errors. Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
@@ -4575,10 +4575,10 @@ static int get_version(void __user * arg)
|
||||
static int get_array_info(mddev_t * mddev, void __user * arg)
|
||||
{
|
||||
mdu_array_info_t info;
|
||||
int nr,working,active,failed,spare;
|
||||
int nr,working,insync,failed,spare;
|
||||
mdk_rdev_t *rdev;
|
||||
|
||||
nr=working=active=failed=spare=0;
|
||||
nr=working=insync=failed=spare=0;
|
||||
list_for_each_entry(rdev, &mddev->disks, same_set) {
|
||||
nr++;
|
||||
if (test_bit(Faulty, &rdev->flags))
|
||||
@@ -4586,7 +4586,7 @@ static int get_array_info(mddev_t * mddev, void __user * arg)
|
||||
else {
|
||||
working++;
|
||||
if (test_bit(In_sync, &rdev->flags))
|
||||
active++;
|
||||
insync++;
|
||||
else
|
||||
spare++;
|
||||
}
|
||||
@@ -4611,7 +4611,7 @@ static int get_array_info(mddev_t * mddev, void __user * arg)
|
||||
info.state = (1<<MD_SB_CLEAN);
|
||||
if (mddev->bitmap && mddev->bitmap_offset)
|
||||
info.state = (1<<MD_SB_BITMAP_PRESENT);
|
||||
info.active_disks = active;
|
||||
info.active_disks = insync;
|
||||
info.working_disks = working;
|
||||
info.failed_disks = failed;
|
||||
info.spare_disks = spare;
|
||||
@@ -4721,7 +4721,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
|
||||
|
Reference in New Issue
Block a user