From mboxrd@z Thu Jan 1 00:00:00 1970 From: Frederic Weisbecker Subject: [PATCH 05/10] res_counter: allow charge failure pointer to be null Date: Wed, 1 Feb 2012 04:37:45 +0100 Message-ID: <1328067470-5980-6-git-send-email-fweisbec@gmail.com> References: <1328067470-5980-1-git-send-email-fweisbec@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=8jM4iOd1dSkxuuN0ySdhchDtgVQlNWT40EsZQNEX4hI=; b=FWldNeRXyJEXxU1kEu8zRbx7W1buP4attxA/Btqc2WWNB4Rk91oDNdZc01puGG/0en QN/WtPCUd9f0qiGupu+6/fwZsPJbbiREgi0LMQoPeTqzZjv5197Od3IwMzLj0R+bS/AC TokudWXZGBKAzJZXdDO6jReiQ+lFjNr0UjjKg= In-Reply-To: <1328067470-5980-1-git-send-email-fweisbec-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Andrew Morton , Tejun Heo , Li Zefan Cc: Aditya Kali , Glauber Costa , Tejun Heo , "Daniel P. Berrange" , Max Kellermann , Tim Hockin , Frederic Weisbecker , Paul Menage , Daniel J Walsh , Oleg Nesterov , LKML , Mandeep Singh Baines , Johannes Weiner , Cgroups , Containers 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 Cc: Paul Menage Cc: Li Zefan Cc: Johannes Weiner Cc: Aditya Kali Cc: Oleg Nesterov Cc: Tim Hockin Cc: Tejun Heo Cc: Containers Cc: Glauber Costa Cc: Cgroups Cc: Daniel J Walsh Cc: "Daniel P. Berrange" Cc: KAMEZAWA Hiroyuki Cc: Max Kellermann Cc: Mandeep Singh Baines Acked-by: Kirill A. Shutemov Signed-off-by: Andrew Morton --- 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