From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752566Ab1G2QN5 (ORCPT ); Fri, 29 Jul 2011 12:13:57 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:39536 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752505Ab1G2QNz (ORCPT ); Fri, 29 Jul 2011 12:13:55 -0400 From: Frederic Weisbecker To: LKML Cc: Frederic Weisbecker , Andrew Morton , Li Zefan , Johannes Weiner , Aditya Kali , Oleg Nesterov Subject: [PATCH 6/8] cgroups: Add res counter common ancestor searching Date: Fri, 29 Jul 2011 18:13:28 +0200 Message-Id: <1311956010-32076-7-git-send-email-fweisbec@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1311956010-32076-1-git-send-email-fweisbec@gmail.com> References: <1311956010-32076-1-git-send-email-fweisbec@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a new API to find the common ancestor between two resource counters. This includes the passed resource counter themselves. Signed-off-by: Frederic Weisbecker Acked-by: Paul Menage Cc: Li Zefan Cc: Johannes Weiner Cc: Aditya Kali Cc: Oleg Nesterov --- include/linux/res_counter.h | 2 ++ kernel/res_counter.c | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h index 8c421ac..354ed30 100644 --- a/include/linux/res_counter.h +++ b/include/linux/res_counter.h @@ -139,6 +139,8 @@ void res_counter_uncharge_until(struct res_counter *counter, struct res_counter unsigned long val); void res_counter_uncharge(struct res_counter *counter, unsigned long val); +struct res_counter *res_counter_common_ancestor(struct res_counter *l, struct res_counter *r); + /** * res_counter_margin - calculate chargeable space of a counter * @cnt: the counter diff --git a/kernel/res_counter.c b/kernel/res_counter.c index 3b48e64..725dfa6 100644 --- a/kernel/res_counter.c +++ b/kernel/res_counter.c @@ -102,6 +102,25 @@ void res_counter_uncharge(struct res_counter *counter, unsigned long val) res_counter_uncharge_until(counter, NULL, val); } +struct res_counter * +res_counter_common_ancestor(struct res_counter *r1, struct res_counter *r2) +{ + struct res_counter *iter; + + while (r1) { + iter = r2; + while (iter) { + if (iter == r1) + return iter; + iter = iter->parent; + } + + r1 = r1->parent; + } + + return NULL; +} + static inline unsigned long long * res_counter_member(struct res_counter *counter, int member) { -- 1.7.5.4