lkml.org 
[lkml]   [2007]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 38/59] md: assorted md and raid1 one-liners
    -stable review patch.  If anyone has any objections, please let us know.
    ------------------

    From: NeilBrown <neilb@suse.de>

    Fix few bugs that meant that:
    - superblocks weren't alway written at exactly the right time (this
    could show up if the array was not written to - writting to the array
    causes lots of superblock updates and so hides these errors).

    - restarting device recovery after a clean shutdown (version-1 metadata
    only) didn't work as intended (or at all).

    1/ Ensure superblock is updated when a new device is added.
    2/ Remove an inappropriate test on MD_RECOVERY_SYNC in md_do_sync.
    The body of this if takes one of two branches depending on whether
    MD_RECOVERY_SYNC is set, so testing it in the clause of the if
    is wrong.
    3/ Flag superblock for updating after a resync/recovery finishes.
    4/ If we find the neeed to restart a recovery in the middle (version-1
    metadata only) make sure a full recovery (not just as guided by
    bitmaps) does get done.

    Signed-off-by: Neil Brown <neilb@suse.de>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    ---
    drivers/md/md.c | 3 ++-
    drivers/md/raid1.c | 1 +
    2 files changed, 3 insertions(+), 1 deletion(-)

    --- linux-2.6.19.2.orig/drivers/md/md.c
    +++ linux-2.6.19.2/drivers/md/md.c
    @@ -3722,6 +3722,7 @@ static int add_new_disk(mddev_t * mddev,
    if (err)
    export_rdev(rdev);

    + md_update_sb(mddev, 1);
    set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
    md_wakeup_thread(mddev->thread);
    return err;
    @@ -5273,7 +5274,6 @@ void md_do_sync(mddev_t *mddev)
    mddev->pers->sync_request(mddev, max_sectors, &skipped, 1);

    if (!test_bit(MD_RECOVERY_ERR, &mddev->recovery) &&
    - test_bit(MD_RECOVERY_SYNC, &mddev->recovery) &&
    !test_bit(MD_RECOVERY_CHECK, &mddev->recovery) &&
    mddev->curr_resync > 2) {
    if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) {
    @@ -5297,6 +5297,7 @@ void md_do_sync(mddev_t *mddev)
    rdev->recovery_offset = mddev->curr_resync;
    }
    }
    + set_bit(MD_CHANGE_DEVS, &mddev->flags);

    skip:
    mddev->curr_resync = 0;
    --- linux-2.6.19.2.orig/drivers/md/raid1.c
    +++ linux-2.6.19.2/drivers/md/raid1.c
    @@ -1956,6 +1956,7 @@ static int run(mddev_t *mddev)
    !test_bit(In_sync, &disk->rdev->flags)) {
    disk->head_position = 0;
    mddev->degraded++;
    + conf->fullsync = 1;
    }
    }
    if (mddev->degraded == conf->raid_disks) {
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-02-03 03:43    [W:0.024 / U:31.940 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site