[PATCH 05/10] res_counter: allow charge failure pointer to be null

Frederic Weisbecker fweisbec at gmail.com
Wed Feb 1 03:37:45 UTC 2012


So that callers of res_counter_charge() don't have to create and pass this
pointer even if they aren't interested in it.

Signed-off-by: Frederic Weisbecker <fweisbec at gmail.com>
Cc: Paul Menage <paul at paulmenage.org>
Cc: Li Zefan <lizf at cn.fujitsu.com>
Cc: Johannes Weiner <hannes at cmpxchg.org>
Cc: Aditya Kali <adityakali at google.com>
Cc: Oleg Nesterov <oleg at redhat.com>
Cc: Tim Hockin <thockin at hockin.org>
Cc: Tejun Heo <htejun at gmail.com>
Cc: Containers <containers at lists.linux-foundation.org>
Cc: Glauber Costa <glommer at gmail.com>
Cc: Cgroups <cgroups at vger.kernel.org>
Cc: Daniel J Walsh <dwalsh at redhat.com>
Cc: "Daniel P. Berrange" <berrange at redhat.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Max Kellermann <mk at cm4all.com>
Cc: Mandeep Singh Baines <msb at chromium.org>
Acked-by: Kirill A. Shutemov <kirill at shutemov.name>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
---
 kernel/res_counter.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/res_counter.c b/kernel/res_counter.c
index 6dc6164..d2fc4cd 100644
--- a/kernel/res_counter.c
+++ b/kernel/res_counter.c
@@ -43,14 +43,16 @@ int res_counter_charge_until(struct res_counter *counter,
 	unsigned long flags;
 	struct res_counter *c, *u;
 
-	*limit_fail_at = NULL;
+	if (limit_fail_at)
+		*limit_fail_at = NULL;
 	local_irq_save(flags);
 	for (c = counter; c != limit; c = c->parent) {
 		spin_lock(&c->lock);
 		ret = res_counter_charge_locked(c, val);
 		spin_unlock(&c->lock);
 		if (ret < 0) {
-			*limit_fail_at = c;
+			if (limit_fail_at)
+				*limit_fail_at = c;
 			goto undo;
 		}
 	}
-- 
1.7.5.4



More information about the Containers mailing list