Commit fcc43a51 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'md-next' of...

Merge branch 'md-next' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/song/md into for-5.7/drivers

Pull MD fixes from Song.

* 'md-next' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/song/md:
  block: keep bdi->io_pages in sync with max_sectors_kb for stacked devices
  md: check arrays is suspended in mddev_detach before call quiesce operations
parents e83995c9 e74d93e9
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -664,6 +664,9 @@ void disk_stack_limits(struct gendisk *disk, struct block_device *bdev,
		printk(KERN_NOTICE "%s: Warning: Device %s is misaligned\n",
		       top, bottom);
	}

	t->backing_dev_info->io_pages =
		t->limits.max_sectors >> (PAGE_SHIFT - 9);
}
EXPORT_SYMBOL(disk_stack_limits);

+1 −1
Original line number Diff line number Diff line
@@ -6184,7 +6184,7 @@ EXPORT_SYMBOL_GPL(md_stop_writes);
static void mddev_detach(struct mddev *mddev)
{
	md_bitmap_wait_behind_writes(mddev);
	if (mddev->pers && mddev->pers->quiesce) {
	if (mddev->pers && mddev->pers->quiesce && !mddev->suspended) {
		mddev->pers->quiesce(mddev, 1);
		mddev->pers->quiesce(mddev, 0);
	}