Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'md/4.4-rc6-fix' of git://neil.brown.name/md
Pull md bugfix from Neil Brown:
"One more md fix for 4.4-rc
Fix a regression which causes reshape to not start properly sometimes"
* tag 'md/4.4-rc6-fix' of git://neil.brown.name/md:
md: remove check for MD_RECOVERY_NEEDED in action_store.
+7
-4
+7
-4
drivers/md/md.c
+7
-4
drivers/md/md.c
···
4326
4326
}
4327
4327
mddev_unlock(mddev);
4328
4328
}
4329
-
} else if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) ||
4330
-
test_bit(MD_RECOVERY_NEEDED, &mddev->recovery))
4329
+
} else if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery))
4331
4330
return -EBUSY;
4332
4331
else if (cmd_match(page, "resync"))
4333
4332
clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
···
4339
4340
return -EINVAL;
4340
4341
err = mddev_lock(mddev);
4341
4342
if (!err) {
4342
-
clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
4343
-
err = mddev->pers->start_reshape(mddev);
4343
+
if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery))
4344
+
err = -EBUSY;
4345
+
else {
4346
+
clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
4347
+
err = mddev->pers->start_reshape(mddev);
4348
+
}
4344
4349
mddev_unlock(mddev);
4345
4350
}
4346
4351
if (err)