Commit ee16c404 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-6.2 

Pull MD fix from Song:

"It fixes an issue introduced by recent code refactor."

* 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md: fix incorrect declaration about claim_rdev in md_import_device
parents 3d25b1e8 b0907cad

drivers/md/md.c

+2 −2
Original line number Diff line number Diff line
@@ -3644,7 +3644,7 @@ EXPORT_SYMBOL_GPL(md_rdev_init); 
 */

static struct md_rdev *md_import_device(dev_t newdev, int super_format, int super_minor)

{

	static struct md_rdev *claim_rdev; /* just for claiming the bdev */

	static struct md_rdev claim_rdev; /* just for claiming the bdev */

	struct md_rdev *rdev;

	sector_t size;

	int err;
@@ -3662,7 +3662,7 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supe 


	rdev->bdev = blkdev_get_by_dev(newdev,

			FMODE_READ | FMODE_WRITE | FMODE_EXCL,

			super_format == -2 ? claim_rdev : rdev);

			super_format == -2 ? &claim_rdev : rdev);

	if (IS_ERR(rdev->bdev)) {

		pr_warn("md: could not open device unknown-block(%u,%u).\n",

			MAJOR(newdev), MINOR(newdev));