Signed-off-by: Jianpeng Ma <[email protected]>
---
mm/kmemleak.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index b1525db..f0ece93 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1225,22 +1225,16 @@ static void scan_gray_list(void)
* from inside the loop. The kmemleak objects cannot be freed from
* outside the loop because their use_count was incremented.
*/
- object = list_entry(gray_list.next, typeof(*object), gray_list);
- while (&object->gray_list != &gray_list) {
+ list_for_each_entry_safe(object, tmp, &gray_list, gray_list) {
cond_resched();
/* may add new objects to the list */
if (!scan_should_stop())
scan_object(object);
- tmp = list_entry(object->gray_list.next, typeof(*object),
- gray_list);
-
/* remove the object from the list and release it */
list_del(&object->gray_list);
put_object(object);
-
- object = tmp;
}
WARN_ON(!list_empty(&gray_list));
}
--
1.8.3.rc1.44.gb387c77
>From 095c9fc03bacb14a896cc9b56c7e2e3843c6051b Mon Sep 17 00:00:00 2001
From: Jianpeng Ma <[email protected]>
Date: Tue, 14 May 2013 15:36:14 +0800
Subject: [PATCH 2/3] mm/kmemleak.c: Use list_for_each_entry_safe to
reconstruct function scan_gray_list.
Signed-off-by: Jianpeng Ma <[email protected]>
---
mm/kmemleak.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index b1525db..f0ece93 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1225,22 +1225,16 @@ static void scan_gray_list(void)
* from inside the loop. The kmemleak objects cannot be freed from
* outside the loop because their use_count was incremented.
*/
- object = list_entry(gray_list.next, typeof(*object), gray_list);
- while (&object->gray_list != &gray_list) {
+ list_for_each_entry_safe(object, tmp, &gray_list, gray_list) {
cond_resched();
/* may add new objects to the list */
if (!scan_should_stop())
scan_object(object);
- tmp = list_entry(object->gray_list.next, typeof(*object),
- gray_list);
-
/* remove the object from the list and release it */
list_del(&object->gray_list);
put_object(object);
-
- object = tmp;
}
WARN_ON(!list_empty(&gray_list));
}
--
1.8.3.rc1.44.gb387c77
