diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-11-06 15:42:08 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-11-06 15:42:08 -0800 |
commit | cdd5b5a9761fd66d17586e4f4ba6588c70e640ea (patch) | |
tree | aba8409818be01f6af8683bf76594c790942d0bc /lib/debugobjects.c | |
parent | 5c15c60e7be615f05a45cd905093a54b11f461bc (diff) | |
parent | 28d3fe32354701decc3e76d89712569c269b5e4f (diff) | |
download | linux-cdd5b5a9761fd66d17586e4f4ba6588c70e640ea.tar.gz linux-cdd5b5a9761fd66d17586e4f4ba6588c70e640ea.tar.bz2 linux-cdd5b5a9761fd66d17586e4f4ba6588c70e640ea.zip |
Merge branch 'next' into for-linus
Prepare input updates for 6.7 merge window.
Diffstat (limited to 'lib/debugobjects.c')
-rw-r--r-- | lib/debugobjects.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/debugobjects.c b/lib/debugobjects.c index 984985c39c9b..a517256a270b 100644 --- a/lib/debugobjects.c +++ b/lib/debugobjects.c @@ -498,6 +498,15 @@ static void debug_print_object(struct debug_obj *obj, char *msg) const struct debug_obj_descr *descr = obj->descr; static int limit; + /* + * Don't report if lookup_object_or_alloc() by the current thread + * failed because lookup_object_or_alloc()/debug_objects_oom() by a + * concurrent thread turned off debug_objects_enabled and cleared + * the hash buckets. + */ + if (!debug_objects_enabled) + return; + if (limit < 5 && descr != descr_test) { void *hint = descr->debug_hint ? descr->debug_hint(obj->object) : NULL; |