diff options
| author | NeilBrown <neilb@suse.de> | 2014-05-28 13:39:23 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2014-05-28 13:39:39 +1000 |
| commit | 3991b31ea072b070081ca3bfa860a077eda67de5 (patch) | |
| tree | cfdaba3df33e15a931abad1e9e119f56af6ff5d9 /drivers/md | |
| parent | c7208164e66f63e3ec1759b98087849286410741 (diff) | |
| download | talos-obmc-linux-3991b31ea072b070081ca3bfa860a077eda67de5.tar.gz talos-obmc-linux-3991b31ea072b070081ca3bfa860a077eda67de5.zip | |
md: always set MD_RECOVERY_INTR when aborting a reshape or other "resync".
If mddev->ro is set, md_to_sync will (correctly) abort.
However in that case MD_RECOVERY_INTR isn't set.
If a RESHAPE had been requested, then ->finish_reshape() will be
called and it will think the reshape was successful even though
nothing happened.
Normally a resync will not be requested if ->ro is set, but if an
array is stopped while a reshape is on-going, then when the array is
started, the reshape will be restarted. If the array is also set
read-only at this point, the reshape will instantly appear to success,
resulting in data corruption.
Consequently, this patch is suitable for any -stable kernel.
Cc: stable@vger.kernel.org (any)
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/md.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 237b7e0ddc7a..48a99b75682c 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -7381,8 +7381,10 @@ void md_do_sync(struct md_thread *thread) /* just incase thread restarts... */ if (test_bit(MD_RECOVERY_DONE, &mddev->recovery)) return; - if (mddev->ro) /* never try to sync a read-only array */ + if (mddev->ro) {/* never try to sync a read-only array */ + set_bit(MD_RECOVERY_INTR, &mddev->recovery); return; + } if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) { if (test_bit(MD_RECOVERY_CHECK, &mddev->recovery)) { |
