Commit ffeeac75 authored by Heinz Mauelshagen's avatar Heinz Mauelshagen Committed by Mike Snitzer
Browse files

dm raid: use rs->raid_disks to avoid memory leaks on free



Also makes code more consistent throughout.
Signed-off-by: default avatarHeinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 7a7c330f
...@@ -717,7 +717,7 @@ static void raid_set_free(struct raid_set *rs) ...@@ -717,7 +717,7 @@ static void raid_set_free(struct raid_set *rs)
{ {
int i; int i;
for (i = 0; i < rs->md.raid_disks; i++) { for (i = 0; i < rs->raid_disks; i++) {
if (rs->dev[i].meta_dev) if (rs->dev[i].meta_dev)
dm_put_device(rs->ti, rs->dev[i].meta_dev); dm_put_device(rs->ti, rs->dev[i].meta_dev);
md_rdev_clear(&rs->dev[i].rdev); md_rdev_clear(&rs->dev[i].rdev);
...@@ -757,7 +757,7 @@ static int parse_dev_params(struct raid_set *rs, struct dm_arg_set *as) ...@@ -757,7 +757,7 @@ static int parse_dev_params(struct raid_set *rs, struct dm_arg_set *as)
if (!arg) if (!arg)
return -EINVAL; return -EINVAL;
for (i = 0; i < rs->md.raid_disks; i++) { for (i = 0; i < rs->raid_disks; i++) {
rs->dev[i].rdev.raid_disk = i; rs->dev[i].rdev.raid_disk = i;
rs->dev[i].meta_dev = NULL; rs->dev[i].meta_dev = NULL;
...@@ -961,7 +961,7 @@ static int validate_raid_redundancy(struct raid_set *rs) ...@@ -961,7 +961,7 @@ static int validate_raid_redundancy(struct raid_set *rs)
* C D D E E * C D D E E
*/ */
if (__is_raid10_near(rs->md.new_layout)) { if (__is_raid10_near(rs->md.new_layout)) {
for (i = 0; i < rs->raid_disks; i++) { for (i = 0; i < rs->md.raid_disks; i++) {
if (!(i % copies)) if (!(i % copies))
rebuilds_per_group = 0; rebuilds_per_group = 0;
if ((!rs->dev[i].rdev.sb_page || if ((!rs->dev[i].rdev.sb_page ||
...@@ -1085,7 +1085,7 @@ static int parse_raid_params(struct raid_set *rs, struct dm_arg_set *as, ...@@ -1085,7 +1085,7 @@ static int parse_raid_params(struct raid_set *rs, struct dm_arg_set *as,
* What is found in the superblocks of the devices is always * What is found in the superblocks of the devices is always
* authoritative, unless 'rebuild' or '[no]sync' was specified. * authoritative, unless 'rebuild' or '[no]sync' was specified.
*/ */
for (i = 0; i < rs->md.raid_disks; i++) { for (i = 0; i < rs->raid_disks; i++) {
set_bit(In_sync, &rs->dev[i].rdev.flags); set_bit(In_sync, &rs->dev[i].rdev.flags);
rs->dev[i].rdev.recovery_offset = MaxSector; rs->dev[i].rdev.recovery_offset = MaxSector;
} }
...@@ -2714,7 +2714,7 @@ static void configure_discard_support(struct raid_set *rs) ...@@ -2714,7 +2714,7 @@ static void configure_discard_support(struct raid_set *rs)
/* RAID level 4,5,6 require discard_zeroes_data for data integrity! */ /* RAID level 4,5,6 require discard_zeroes_data for data integrity! */
raid456 = (rs->md.level == 4 || rs->md.level == 5 || rs->md.level == 6); raid456 = (rs->md.level == 4 || rs->md.level == 5 || rs->md.level == 6);
for (i = 0; i < rs->md.raid_disks; i++) { for (i = 0; i < rs->raid_disks; i++) {
struct request_queue *q; struct request_queue *q;
if (!rs->dev[i].rdev.bdev) if (!rs->dev[i].rdev.bdev)
...@@ -3186,7 +3186,6 @@ static void raid_status(struct dm_target *ti, status_type_t type, ...@@ -3186,7 +3186,6 @@ static void raid_status(struct dm_target *ti, status_type_t type,
sync_action = decipher_sync_action(&rs->md); sync_action = decipher_sync_action(&rs->md);
/* HM FIXME: do we want another state char for raid0? It shows 'D' or 'A' now */ /* HM FIXME: do we want another state char for raid0? It shows 'D' or 'A' now */
rdev_for_each(rdev, mddev)
for (i = 0; i < rs->raid_disks; i++) for (i = 0; i < rs->raid_disks; i++)
DMEMIT(__raid_dev_status(&rs->dev[i].rdev, array_in_sync)); DMEMIT(__raid_dev_status(&rs->dev[i].rdev, array_in_sync));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment