Merge tag 'md/4.1-rc7-fixes' of git://neil.brown.name/md

Pull three more md fixes from Neil Brown: "Hasn't been a good cycle for md has it :-( The main issue fixed here is a rare race which can result in two reshape threads running at once, which doesn't end well. Also a minor issue with a write to a sysfs file returning the wrong value. Backports to 4.0-stable are indicated" * tag 'md/4.1-rc7-fixes' of git://neil.brown.name/md: md: make sure MD_RECOVERY_DONE is clear before starting recovery/resync md: Close race when setting 'action' to 'idle'. md: don't return 0 from array_state_store

Linus Torvalds committed 11 years ago

Commit 7b565d92 parents c39f3bc ea358cd3 files · +10 −6Browse files

Unified · Split

3 files

drivers/md/md.c +8 −6
drivers/md/raid10.c +1 −0
drivers/md/raid5.c +1 −0

drivers/md/md.c+8−6

 				err = -EBUSY;
 		}
 		spin_unlock(&mddev->lock);
-		return err;
+		return err ?: len;
 	}
 	err = mddev_lock(mddev);
 	if (err)
 			set_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
 		else
 			clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
-		flush_workqueue(md_misc_wq);
+		if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) &&
-		if (mddev->sync_thread) {
+		    mddev_lock(mddev) == 0) {
-			set_bit(MD_RECOVERY_INTR, &mddev->recovery);
+			flush_workqueue(md_misc_wq);
-			if (mddev_lock(mddev) == 0) {
+			if (mddev->sync_thread) {
+				set_bit(MD_RECOVERY_INTR, &mddev->recovery);
 				md_reap_sync_thread(mddev);
-				mddev_unlock(mddev);
 			}
+			mddev_unlock(mddev);
 		}
 	} else if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) ||
 		   test_bit(MD_RECOVERY_NEEDED, &mddev->recovery))
 	if (mddev_is_clustered(mddev))
 		md_cluster_ops->metadata_update_finish(mddev);
 	clear_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
+	clear_bit(MD_RECOVERY_DONE, &mddev->recovery);
 	clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
 	clear_bit(MD_RECOVERY_RESHAPE, &mddev->recovery);
 	clear_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);

drivers/md/raid10.c+1−0

@@ -4156,6 +4156,7 @@ static int raid10_start_reshape(struct mddev *mddev) · 4155 unmodified lines
4156		4156
4157	clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);	4157	clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
4158	clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);	4158	clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);
		4159	clear_bit(MD_RECOVERY_DONE, &mddev->recovery);
4159	set_bit(MD_RECOVERY_RESHAPE, &mddev->recovery);	4160	set_bit(MD_RECOVERY_RESHAPE, &mddev->recovery);
4160	set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);	4161	set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
4161		4162

drivers/md/raid5.c+1−0

@@ -7354,6 +7354,7 @@ static int raid5_start_reshape(struct mddev *mddev) · 7353 unmodified lines
7354		7354
7355	clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);	7355	clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
7356	clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);	7356	clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);
		7357	clear_bit(MD_RECOVERY_DONE, &mddev->recovery);
7357	set_bit(MD_RECOVERY_RESHAPE, &mddev->recovery);	7358	set_bit(MD_RECOVERY_RESHAPE, &mddev->recovery);
7358	set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);	7359	set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
7359	mddev->sync_thread = md_register_thread(md_do_sync, mddev,	7360	mddev->sync_thread = md_register_thread(md_do_sync, mddev,

Merge tag 'md/4.1-rc7-fixes' of git://neil.brown.name/md

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code