]> git.hungrycats.org Git - linux/commitdiff
md/linear: shutup lockdep warnning
authorShaohua Li <shli@fb.com>
Tue, 21 Feb 2017 19:57:01 +0000 (11:57 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 21 Oct 2017 15:09:05 +0000 (17:09 +0200)
[ Upstream commit d939cdfde34f50b95254b375f498447c82190b3e ]

Commit 03a9e24(md linear: fix a race between linear_add() and
linear_congested()) introduces the warnning.

Acked-by: Coly Li <colyli@suse.de>
Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/md/linear.c

index 6ba3227e29b27ff924240ef125654c227fd88992..7ffb20ec1a46a57f76c1af44273fc71b870d11fe 100644 (file)
@@ -223,7 +223,8 @@ static int linear_add(struct mddev *mddev, struct md_rdev *rdev)
         * oldconf until no one uses it anymore.
         */
        mddev_suspend(mddev);
-       oldconf = rcu_dereference(mddev->private);
+       oldconf = rcu_dereference_protected(mddev->private,
+                       lockdep_is_held(&mddev->reconfig_mutex));
        mddev->raid_disks++;
        WARN_ONCE(mddev->raid_disks != newconf->raid_disks,
                "copied raid_disks doesn't match mddev->raid_disks");