From 5a6ec8b8cf163720c62821d99e45c6dccb964640 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Wed, 29 Jul 2009 16:26:57 +0100 Subject: [PATCH] --- yaml --- r: 156030 b: refs/heads/master c: f5886c7f96f2542382d3a983c5f13e03d7fc5259 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/kmemleak.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 82454ae05896..5735be89de2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84210aeb4a6a77de8a3067b121026bad630cd3da +refs/heads/master: f5886c7f96f2542382d3a983c5f13e03d7fc5259 diff --git a/trunk/mm/kmemleak.c b/trunk/mm/kmemleak.c index 5aabd41ffb8f..487267310a84 100644 --- a/trunk/mm/kmemleak.c +++ b/trunk/mm/kmemleak.c @@ -1217,7 +1217,6 @@ static void *kmemleak_seq_start(struct seq_file *seq, loff_t *pos) } object = NULL; out: - rcu_read_unlock(); return object; } @@ -1233,13 +1232,11 @@ static void *kmemleak_seq_next(struct seq_file *seq, void *v, loff_t *pos) ++(*pos); - rcu_read_lock(); list_for_each_continue_rcu(n, &object_list) { next_obj = list_entry(n, struct kmemleak_object, object_list); if (get_object(next_obj)) break; } - rcu_read_unlock(); put_object(prev_obj); return next_obj; @@ -1255,6 +1252,7 @@ static void kmemleak_seq_stop(struct seq_file *seq, void *v) * kmemleak_seq_start may return ERR_PTR if the scan_mutex * waiting was interrupted, so only release it if !IS_ERR. */ + rcu_read_unlock(); mutex_unlock(&scan_mutex); if (v) put_object(v);