Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 0fbae13642fc35ba6a774e9f76d0c1946e8f5c35

Authored by Linus Torvalds
2 parents dec943f5f3 45eaf45dfa
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

Merge tag 'md/3.18-fix' of git://neil.brown.name/md 

Pull md bugfix from Neil Brown:
 "One fix for md for 3.18.

  This fixes a regression introduced in 3.13"

* tag 'md/3.18-fix' of git://neil.brown.name/md:
  md: Always set RECOVERY_NEEDED when clearing RECOVERY_FROZEN

Showing 1 changed file Side-by-side Diff

... ... @@ -5121,6 +5121,7 @@
5121 5121 printk("md: %s still in use.\n",mdname(mddev));
5122 5122 if (did_freeze) {
5123 5123 clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
  5124 + set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
5124 5125 md_wakeup_thread(mddev->thread);
5125 5126 }
5126 5127 err = -EBUSY;
... ... @@ -5135,6 +5136,8 @@
5135 5136 mddev->ro = 1;
5136 5137 set_disk_ro(mddev->gendisk, 1);
5137 5138 clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
  5139 + set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
  5140 + md_wakeup_thread(mddev->thread);
5138 5141 sysfs_notify_dirent_safe(mddev->sysfs_state);
5139 5142 err = 0;
5140 5143 }
... ... @@ -5178,6 +5181,7 @@
5178 5181 mutex_unlock(&mddev->open_mutex);
5179 5182 if (did_freeze) {
5180 5183 clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
  5184 + set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
5181 5185 md_wakeup_thread(mddev->thread);
5182 5186 }
5183 5187 return -EBUSY;