Commit 0fbae136 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents dec943f5 45eaf45d

drivers/md/md.c

+4 −0
Original line number Diff line number Diff line
@@ -5121,6 +5121,7 @@ static int md_set_readonly(struct mddev *mddev, struct block_device *bdev) 
		printk("md: %s still in use.\n",mdname(mddev));

		if (did_freeze) {

			clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);

			set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);

			md_wakeup_thread(mddev->thread);

		}

		err = -EBUSY;
@@ -5135,6 +5136,8 @@ static int md_set_readonly(struct mddev *mddev, struct block_device *bdev) 
		mddev->ro = 1;

		set_disk_ro(mddev->gendisk, 1);

		clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);

		set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);

		md_wakeup_thread(mddev->thread);

		sysfs_notify_dirent_safe(mddev->sysfs_state);

		err = 0;

	}
@@ -5178,6 +5181,7 @@ static int do_md_stop(struct mddev *mddev, int mode, 
		mutex_unlock(&mddev->open_mutex);

		if (did_freeze) {

			clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);

			set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);

			md_wakeup_thread(mddev->thread);

		}

		return -EBUSY;