Commit 68ca92aa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://neil.brown.name/md:
  md: Call blk_queue_flush() to establish flush/fua support
  md/raid1: really fix recovery looping when single good device fails.
  md: fix return value of rdev_size_change()
parents c42978f7 be20e6c6

drivers/md/md.c

+4 −2
Original line number Diff line number Diff line
@@ -1337,7 +1337,7 @@ super_90_rdev_size_change(mdk_rdev_t *rdev, sector_t num_sectors) 
	md_super_write(rdev->mddev, rdev, rdev->sb_start, rdev->sb_size,

		       rdev->sb_page);

	md_super_wait(rdev->mddev);

	return num_sectors / 2; /* kB for sysfs */

	return num_sectors;

}
@@ -1704,7 +1704,7 @@ super_1_rdev_size_change(mdk_rdev_t *rdev, sector_t num_sectors) 
	md_super_write(rdev->mddev, rdev, rdev->sb_start, rdev->sb_size,

		       rdev->sb_page);

	md_super_wait(rdev->mddev);

	return num_sectors / 2; /* kB for sysfs */

	return num_sectors;

}



static struct super_type super_types[] = {
@@ -4338,6 +4338,8 @@ static int md_alloc(dev_t dev, char *name) 
	if (mddev->kobj.sd &&

	    sysfs_create_group(&mddev->kobj, &md_bitmap_group))

		printk(KERN_DEBUG "pointless warning\n");



	blk_queue_flush(mddev->queue, REQ_FLUSH | REQ_FUA);

 abort:

	mutex_unlock(&disks_mutex);

	if (!error && mddev->kobj.sd) {

drivers/md/raid1.c

+1 −0
Original line number Diff line number Diff line
@@ -1161,6 +1161,7 @@ static int raid1_remove_disk(mddev_t *mddev, int number) 
		 * is not possible.

		 */

		if (!test_bit(Faulty, &rdev->flags) &&

		    !mddev->recovery_disabled &&

		    mddev->degraded < conf->raid_disks) {

			err = -EBUSY;

			goto abort;