From 2a9f840972baf0819c5a63508a6b24a6f9251c55 Mon Sep 17 00:00:00 2001 From: Adam Kwolek Date: Mon, 17 Jan 2011 12:44:52 +1100 Subject: [PATCH] FIX: sync_completed == 0 causes reshape cancellation in metadata md signals reshape completion (whole area or parts) by setting sync_completed to 0. This causes in set_array_state() to rollback metadata changes (super-intel.c:4977. To avoid this do not allow for set last_checkpoint to 0 if reshape is finished. This was also root cause of my previous fix for finalization reshape that I agreed earlier is not necessary, Signed-off-by: Adam Kwolek Signed-off-by: NeilBrown --- monitor.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/monitor.c b/monitor.c index 1107d47..b7287d8 100644 --- a/monitor.c +++ b/monitor.c @@ -363,8 +363,10 @@ static int read_and_act(struct active_array *a) /* Reshape has progressed or completed so we need to * update the array state - and possibly the array size */ - a->last_checkpoint = sync_completed; + if (sync_completed != 0) + a->last_checkpoint = sync_completed; a->container->ss->set_array_state(a, a->curr_state <= clean); + a->last_checkpoint = sync_completed; } if (sync_completed > a->last_checkpoint)