Merge branch 'for-linus' of git://neil.brown.name/md

* 'for-linus' of git://neil.brown.name/md: Fix new incorrect error return from do_md_stop.

Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md: Fix new incorrect error return from do_md_stop.
Linus Torvalds
2 parents df4ecf1524 80ffb3ccea
Showing 1 changed file Side-by-side Diff
drivers/md/md.c
@@ -4364,6 +4364,7 @@
 		if (mode == 1)
 			set_disk_ro(disk, 1);
 		clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
+		err = 0;
 	}
 out:
 	mutex_unlock(&mddev->open_mutex);
...	...	@@ -4364,6 +4364,7 @@
4364	4364	if (mode == 1)
4365	4365	set_disk_ro(disk, 1);
4366	4366	clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
	4367	+ err = 0;
4367	4368	}
4368	4369	out:
4369	4370	mutex_unlock(&mddev->open_mutex);