Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0cf008f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 3bef22ee 312045ee

drivers/md/md.c

+7 −4
Original line number Diff line number Diff line
@@ -4326,8 +4326,7 @@ action_store(struct mddev *mddev, const char *page, size_t len) 
			}

			mddev_unlock(mddev);

		}

	} else if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) ||

		   test_bit(MD_RECOVERY_NEEDED, &mddev->recovery))

	} else if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery))

		return -EBUSY;

	else if (cmd_match(page, "resync"))

		clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
@@ -4340,8 +4339,12 @@ action_store(struct mddev *mddev, const char *page, size_t len) 
			return -EINVAL;

		err = mddev_lock(mddev);

		if (!err) {

			if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery))

				err =  -EBUSY;

			else {

				clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);

				err = mddev->pers->start_reshape(mddev);

			}

			mddev_unlock(mddev);

		}

		if (err)