diff options
Diffstat (limited to 'mm/kmemleak.c')
-rw-r--r-- | mm/kmemleak.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 83dd5fbf5e60..c8d7f3110fd0 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c | |||
@@ -436,7 +436,7 @@ static int get_object(struct kmemleak_object *object) | |||
436 | */ | 436 | */ |
437 | static void free_object_rcu(struct rcu_head *rcu) | 437 | static void free_object_rcu(struct rcu_head *rcu) |
438 | { | 438 | { |
439 | struct hlist_node *elem, *tmp; | 439 | struct hlist_node *tmp; |
440 | struct kmemleak_scan_area *area; | 440 | struct kmemleak_scan_area *area; |
441 | struct kmemleak_object *object = | 441 | struct kmemleak_object *object = |
442 | container_of(rcu, struct kmemleak_object, rcu); | 442 | container_of(rcu, struct kmemleak_object, rcu); |
@@ -445,8 +445,8 @@ static void free_object_rcu(struct rcu_head *rcu) | |||
445 | * Once use_count is 0 (guaranteed by put_object), there is no other | 445 | * Once use_count is 0 (guaranteed by put_object), there is no other |
446 | * code accessing this object, hence no need for locking. | 446 | * code accessing this object, hence no need for locking. |
447 | */ | 447 | */ |
448 | hlist_for_each_entry_safe(area, elem, tmp, &object->area_list, node) { | 448 | hlist_for_each_entry_safe(area, tmp, &object->area_list, node) { |
449 | hlist_del(elem); | 449 | hlist_del(&area->node); |
450 | kmem_cache_free(scan_area_cache, area); | 450 | kmem_cache_free(scan_area_cache, area); |
451 | } | 451 | } |
452 | kmem_cache_free(object_cache, object); | 452 | kmem_cache_free(object_cache, object); |
@@ -1177,7 +1177,6 @@ static void scan_block(void *_start, void *_end, | |||
1177 | static void scan_object(struct kmemleak_object *object) | 1177 | static void scan_object(struct kmemleak_object *object) |
1178 | { | 1178 | { |
1179 | struct kmemleak_scan_area *area; | 1179 | struct kmemleak_scan_area *area; |
1180 | struct hlist_node *elem; | ||
1181 | unsigned long flags; | 1180 | unsigned long flags; |
1182 | 1181 | ||
1183 | /* | 1182 | /* |
@@ -1205,7 +1204,7 @@ static void scan_object(struct kmemleak_object *object) | |||
1205 | spin_lock_irqsave(&object->lock, flags); | 1204 | spin_lock_irqsave(&object->lock, flags); |
1206 | } | 1205 | } |
1207 | } else | 1206 | } else |
1208 | hlist_for_each_entry(area, elem, &object->area_list, node) | 1207 | hlist_for_each_entry(area, &object->area_list, node) |
1209 | scan_block((void *)area->start, | 1208 | scan_block((void *)area->start, |
1210 | (void *)(area->start + area->size), | 1209 | (void *)(area->start + area->size), |
1211 | object, 0); | 1210 | object, 0); |