diff options
author | Yunsheng Lin <linyunsheng@huawei.com> | 2021-08-03 13:58:21 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-12 14:22:07 +0300 |
commit | 9b2b2f07712bd2ab0566dde3bd2ac770841b8a16 (patch) | |
tree | a21da190ea525f6a4ab1a9143970974ed0ddf651 | |
parent | d1f2abe57bc1c9cf2fba49174d6e184e9a7ac924 (diff) | |
download | linux-9b2b2f07712bd2ab0566dde3bd2ac770841b8a16.tar.xz |
net: sched: fix lockdep_set_class() typo error for sch->seqlock
[ Upstream commit 06f5553e0f0c2182268179b93856187d9cb86dd5 ]
According to comment in qdisc_alloc(), sch->seqlock's lockdep
class key should be set to qdisc_tx_busylock, due to possible
type error, sch->busylock's lockdep class key is set to
qdisc_tx_busylock, which is duplicated because sch->busylock's
lockdep class key is already set in qdisc_alloc().
So fix it by replacing sch->busylock with sch->seqlock.
Fixes: 96009c7d500e ("sched: replace __QDISC_STATE_RUNNING bit with a spin lock")
Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r-- | net/sched/sch_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 854d2b38db85..05aa2571a409 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -886,7 +886,7 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue, /* seqlock has the same scope of busylock, for NOLOCK qdisc */ spin_lock_init(&sch->seqlock); - lockdep_set_class(&sch->busylock, + lockdep_set_class(&sch->seqlock, dev->qdisc_tx_busylock ?: &qdisc_tx_busylock); seqcount_init(&sch->running); |