diff --git a/[refs] b/[refs] index dd91327106f1..876da2ba0927 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3eda22d19b76b15ef3420b251bd47a0ba0127589 +refs/heads/master: 1031be7a5fafd3a858dfaabb74d98f9ca20744a8 diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index d1cb45f6d6a9..ec3d8e8a0bd3 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -1633,7 +1633,8 @@ static void md_update_sb(mddev_t * mddev, int force_change) * and 'events' is odd, we can roll back to the previous clean state */ if (nospares && (mddev->in_sync && mddev->recovery_cp == MaxSector) - && (mddev->events & 1)) + && (mddev->events & 1) + && mddev->events != 1) mddev->events--; else { /* otherwise we have to go forward and ... */