Commit 63492a2d authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'md-6.14-20250116' of... 

Merge tag 'md-6.14-20250116' of https://git.kernel.org/pub/scm/linux/kernel/git/mdraid/linux into for-6.14/block

Pull MD fix from Song.

* tag 'md-6.14-20250116' of https://git.kernel.org/pub/scm/linux/kernel/git/mdraid/linux:
  md/md-linear: Fix a NULL vs IS_ERR() bug in linear_add()
parents 3d9a9e9a 62c55207

drivers/md/md-linear.c

+2 −2
Original line number Diff line number Diff line
@@ -204,8 +204,8 @@ static int linear_add(struct mddev *mddev, struct md_rdev *rdev) 
	rdev->saved_raid_disk = -1;



	newconf = linear_conf(mddev, mddev->raid_disks + 1);

	if (!newconf)

		return -ENOMEM;

	if (IS_ERR(newconf))

		return PTR_ERR(newconf);



	/* newconf->raid_disks already keeps a copy of * the increased

	 * value of mddev->raid_disks, WARN_ONCE() is just used to make