From 0a6ad70f070dfda142436742cc351c4cd6f76849 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 17 Aug 2024 09:37:23 +0000 Subject: [PATCH] Revert "net/sched: unregister lockdep keys in qdisc_create/qdisc_alloc error path" This reverts commit 48d3f91d83eb81557409e2c2cc8a798ca5d0e25b which is commit 86735b57c905e775f05de995df35379366b72168 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: Icdc66b3ac841d0fb5e94250153a3dc02b14ea750 Signed-off-by: Greg Kroah-Hartman --- net/sched/sch_api.c | 1 - net/sched/sch_generic.c | 1 - 2 files changed, 2 deletions(-) diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index bf8e45ffc298..334a563e0bc1 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -1353,7 +1353,6 @@ err_out5: if (ops->destroy) ops->destroy(sch); err_out3: - lockdep_unregister_key(&sch->root_lock_key); netdev_put(dev, &sch->dev_tracker); qdisc_free(sch); err_out2: diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 7053c0292c33..d4b4e32aa0e0 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -978,7 +978,6 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue, return sch; errout1: - lockdep_unregister_key(&sch->root_lock_key); kfree(sch); errout: return ERR_PTR(err);