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()
This commit is contained in:
Jens Axboe 2025-01-16 14:42:37 -07:00
commit 63492a2d7e

View File

@ -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