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

Merge branch 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-5.16 

Pull MD fixes from Song.

* 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md: fix double free of mddev->private in autorun_array()
  md: fix update super 1.0 on rdev size change
parents 091f06d9 07641b5f

drivers/md/md.c

+3 −1
Original line number Diff line number Diff line
@@ -2189,6 +2189,7 @@ super_1_rdev_size_change(struct md_rdev *rdev, sector_t num_sectors) 


		if (!num_sectors || num_sectors > max_sectors)

			num_sectors = max_sectors;

		rdev->sb_start = sb_start;

	}

	sb = page_address(rdev->sb_page);

	sb->data_size = cpu_to_le64(num_sectors);
@@ -6270,6 +6271,7 @@ static void __md_stop(struct mddev *mddev) 
	spin_lock(&mddev->lock);

	mddev->pers = NULL;

	spin_unlock(&mddev->lock);

	if (mddev->private)

		pers->free(mddev, mddev->private);

	mddev->private = NULL;

	if (pers->sync_request && mddev->to_remove == NULL)