shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "net/sched: unregister lockdep keys in qdisc_create/qdisc_alloc error path"

Browse Source 
This reverts commit 48d3f91d83 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 <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-08-17 09:37:23 +00:00
committed by Treehugger Robot
parent 325f5b8ed9
commit 0a6ad70f07
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/sched/sch_api.c
View File

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

1
net/sched/sch_generic.c
View File

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