> -----Original Message----- > From: Neil Brown [mailto:neilb@xxxxxxx] > Sent: Friday, January 28, 2011 1:25 AM > To: Kwolek, Adam > Cc: linux-raid@xxxxxxxxxxxxxxx; Williams, Dan J; Ciechanowski, Ed; > Neubauer, Wojciech > Subject: Re: [PATCH 1/7] imsm: Update metadata for second array > > On Wed, 26 Jan 2011 16:03:17 +0100 > Adam Kwolek <adam.kwolek@xxxxxxxxx> wrote: > > > When second array reshape is about to start external metadata should > > be updated by mdmon in imsm_set_array_state(). > > for this purposes imsm_progress_container_reshape() is reused. > > We seem to be failing to communicate... > > I told you that you didn't need extra arguments to > imsm_progress_container_reshape because IT ALREADY DOES THE RIGHT > THING. > It finds the array that needs to be reshaped next, and it starts the > reshape. > > You removed the extra arguments from your previous patch, but put extra > code in imsm_progress_container_reshape to to what it ALREADY DOES. > > Have you read and understood the code? Yes > > If something isn't working the way you expect, please detail exactly > what. prev_disks can be set with wrong value. This leads not to reshape continuation of next array, but to metadata rollback of reshaped array. > It is quite possible that the code isn't quite right, but trying to > change it when you don't appear to understand it isn't going to > achieve anything useful. > > NeilBrown Not exactly, but I'll remove reshape array condition double check from patch, and leave things (proper prev_disks initialization) that makes me happy in imsm_progress_container_reshape() only. You can expect changed patch today. BR Adam > > > > > > Signed-off-by: Adam Kwolek <adam.kwolek@xxxxxxxxx> > > --- > > > > super-intel.c | 49 > > ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 > > insertions(+), 1 deletions(-) > > > > diff --git a/super-intel.c b/super-intel.c > > index 8d1f0ad..4e96196 100644 > > --- a/super-intel.c > > +++ b/super-intel.c > > @@ -5052,6 +5052,46 @@ static void > > imsm_progress_container_reshape(struct intel_super *super) struct > > imsm_super *mpb = super->anchor; int prev_disks = -1; > > int i; > > + int any_migration_in_progress = 0; > > + int disks_count_max = 0; > > + struct imsm_dev *dev_next = NULL; > > + > > + /* find maximum number of disks used in any array > > + * and check if any migration is in progress > > + */ > > + for (i = 0; i < mpb->num_raid_devs; i++) { > > + struct imsm_dev *dev = get_imsm_dev(super, i); > > + struct imsm_map *map = get_imsm_map(dev, 0); > > + struct imsm_map *migr_map = get_imsm_map(dev, 1); > > + if (migr_map) > > + any_migration_in_progress = 1; > > + if (map->num_members > disks_count_max) > > + disks_count_max = map->num_members; > > + } > > + > > + if (any_migration_in_progress == 0) { > > + /* no migration in progress > > + * so we can check if next migration in container > > + * should be started > > + */ > > + int next_inst = -1; > > + > > + for (i = 0; i < mpb->num_raid_devs; i++) { > > + struct imsm_dev *dev = get_imsm_dev(super, > > i); > > + struct imsm_map *map = get_imsm_map(dev, 0); > > + if (map->num_members < disks_count_max) { > > + next_inst = i; > > + break; > > + } > > + } > > + if (next_inst >= 0) { > > + /* found array with smaller number of disks > > in array, > > + * this array should be expanded > > + */ > > + dev_next = get_imsm_dev(super, next_inst); > > + prev_disks = disks_count_max; > > + } > > + } > > > > for (i = 0; i < mpb->num_raid_devs; i++) { > > struct imsm_dev *dev = get_imsm_dev(super, i); > > @@ -5063,6 +5103,9 @@ static void > > imsm_progress_container_reshape(struct intel_super *super) if > > (dev->vol.migr_state) return; > > > > + if ((dev_next != NULL) && (dev_next != dev)) > > + continue; > > + > > if (prev_disks == -1) > > prev_disks = map->num_members; > > if (prev_disks == map->num_members) > > @@ -5244,13 +5287,17 @@ static int imsm_set_array_state(struct > > active_array *a, int consistent) super->updates_pending++; > > } > > > > - /* finalize online capacity expansion/reshape */ > > + /* manage online capacity expansion/reshape */ > > if ((a->curr_action != reshape) && > > (a->prev_action == reshape)) { > > struct mdinfo *mdi; > > > > + /* finalize online capacity expansion/reshape */ > > for (mdi = a->info.devs; mdi; mdi = mdi->next) > > imsm_set_disk(a, mdi->disk.raid_disk, > > mdi->curr_state); + > > + /* check next volume reshape */ > > + imsm_progress_container_reshape(super); > > } > > > > return consistent; -- To unsubscribe from this list: send the line "unsubscribe linux-raid" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
