The patch titled
Subject: debugobjects-insulate-non-fixup-logic-related-to-static-obj-from-fixup-callbacks-v2
has been removed from the -mm tree. Its filename was
debugobjects-insulate-non-fixup-logic-related-to-static-obj-from-fixup-callbacks-v2.patch
This patch was dropped because it was folded into debugobjects-insulate-non-fixup-logic-related-to-static-obj-from-fixup-callbacks.patch
------------------------------------------------------
From: "Du, Changbin" <changbin.du@xxxxxxxxx>
Subject: debugobjects-insulate-non-fixup-logic-related-to-static-obj-from-fixup-callbacks-v2
improve code comments where invoke the new is_static_object callback
Link: http://lkml.kernel.org/r/1462777431-8171-1-git-send-email-changbin.du@xxxxxxxxx
Signed-off-by: "Du, Changbin" <changbin.du@xxxxxxxxx>
Cc: Jonathan Corbet <corbet@xxxxxxx>
Cc: Josh Triplett <josh@xxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/debugobjects.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff -puN lib/debugobjects.c~debugobjects-insulate-non-fixup-logic-related-to-static-obj-from-fixup-callbacks-v2 lib/debugobjects.c
--- a/lib/debugobjects.c~debugobjects-insulate-non-fixup-logic-related-to-static-obj-from-fixup-callbacks-v2
+++ a/lib/debugobjects.c
@@ -431,12 +431,14 @@ int debug_object_activate(void *addr, st
raw_spin_unlock_irqrestore(&db->lock, flags);
/*
- * This happens when a static object is activated. We
- * let the type specific code decide whether this is
- * true or not.
+ * We are here when a static object is activated. We
+ * let the type specific code confirm whether this is
+ * true or not. if true, we just make sure that the
+ * static object is tracked in the object tracker. If
+ * not, this must be a bug, so we try to fix it up.
*/
if (descr->is_static_object && descr->is_static_object(addr)) {
- /* Just make sure that it is tracked in the object tracker */
+ /* track this static object */
debug_object_init(addr, descr);
debug_object_activate(addr, descr);
} else {
@@ -607,11 +609,12 @@ void debug_object_assert_init(void *addr
raw_spin_unlock_irqrestore(&db->lock, flags);
/*
- * Maybe the object is static. Let the type specific
- * code decide what to do.
+ * Maybe the object is static, and we let the type specific
+ * code confirm. Track this static object if true, else invoke
+ * fixup.
*/
if (descr->is_static_object && descr->is_static_object(addr)) {
- /* Make sure that it is tracked in the object tracker */
+ /* Track this static object */
debug_object_init(addr, descr);
} else {
debug_print_object(&o, "assert_init");
_
Patches currently in -mm which might be from changbin.du@xxxxxxxxx are
debugobjects-make-fixup-functions-return-bool-instead-of-int.patch
debugobjects-correct-the-usage-of-fixup-call-results.patch
workqueue-update-debugobjects-fixup-callbacks-return-type.patch
timer-update-debugobjects-fixup-callbacks-return-type.patch
rcu-update-debugobjects-fixup-callbacks-return-type.patch
percpu_counter-update-debugobjects-fixup-callbacks-return-type.patch
documentation-update-debugobjects-doc.patch
debugobjects-insulate-non-fixup-logic-related-to-static-obj-from-fixup-callbacks.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
