From patchwork Wed May 31 20:46:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Praveen Kumar X-Patchwork-Id: 9758061 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0DD0760390 for ; Wed, 31 May 2017 20:50:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 00F82284C7 for ; Wed, 31 May 2017 20:50:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E9CC2284CF; Wed, 31 May 2017 20:50:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A6709284D1 for ; Wed, 31 May 2017 20:50:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dGAWo-0007sV-CY; Wed, 31 May 2017 20:47:38 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dGAWn-0007sE-DO for xen-devel@lists.xen.org; Wed, 31 May 2017 20:47:37 +0000 Received: from [85.158.143.35] by server-11.bemta-6.messagelabs.com id 8D/ED-03587-8EB2F295; Wed, 31 May 2017 20:47:36 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKIsWRWlGSWpSXmKPExsVyMfTAId0X2vq RBhe+Mlos+biYxYHR4+ju30wBjFGsmXlJ+RUJrBnPf+9mKrjNW3F5rmoD4wSuLkYuDiGBiYwS K5s2sIE4LAIvWSQm7HrLAuJICPSzSnz9tBzI4QRy4iTebpjJDmFXSfxdeZUZxBYSUJPYMu8UM 8SoX4wS2xvWs3YxcnCwCehKtN8qAKkREZCWuPb5MiOIzSywgVliTY8biC0sECLx7uhasDiLgK rErYlzwObzCthI/GxoZILYJS+xaNMMsBs4BWwlrnQtZoPYayOxcP0EtgmMAgsYGVYxahSnFpW lFukaGuglFWWmZ5TkJmbmAHlmermpxcWJ6ak5iUnFesn5uZsYgYHFAAQ7GO8tCzjEKMnBpCTK W2GjFynEl5SfUpmRWJwRX1Sak1p8iFGGg0NJgtdVSz9SSLAoNT21Ii0zBxjiMGkJDh4lEd6jI Gne4oLE3OLMdIjUKUZjjitX1n1h4phyYPsXJiGWvPy8VClx3i6QUgGQ0ozSPLhBsNi7xCgrJc zLCHSaEE9BalFuZgmq/CtGcQ5GJWHeRSBTeDLzSuD2vQI6hQnolF07tEFOKUlESEk1MJZvrzz rphOQ4HGeeR8nm5janXVsQTOn/vx57orRs3tfJHecPHhozsXsxdfYo6LatZgzXMPnWCQWbHG6 ObXozTLu2RNsDV4+TPxYFJ+3eNU5i3WLS9c7PZzxdV7x4S6JGXfzMniW3P24S9LCTM5fx69hz 5HjywT/LLj0qnxP/+HsIL9dadWvngkqsRRnJBpqMRcVJwIAe0q5kLgCAAA= X-Env-Sender: kpraveen.lkml@gmail.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1496263654!68186028!1 X-Originating-IP: [209.85.192.194] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44877 invoked from network); 31 May 2017 20:47:35 -0000 Received: from mail-pf0-f194.google.com (HELO mail-pf0-f194.google.com) (209.85.192.194) by server-3.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 31 May 2017 20:47:35 -0000 Received: by mail-pf0-f194.google.com with SMTP id u26so4125018pfd.2 for ; Wed, 31 May 2017 13:47:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XOguDzLRKEDINzckhKa5fOA6yPf4d73mzyOAKNz4SoE=; b=ESIqO1iaJTDp9VSCzvuBK2shUdyp+v3tU2O85A4qK5fqbHxUK3f1rWNwVFTPONfKsk SkhWjtarhItJUfrZfvb/LjraA6Xl4QxuInVeOP040C4Byxl5R6nqIxPPoQNKo0kW20IX s9k5Yq5FIc+4X9DWwzzF71sjIUXwb15AAE/drWBrIyVy5Y1GJ1aN46drBmzfOmhUJSg8 4tdrE8TjN5wAQ34VPu1w/rU7q1upLcfplIGqviErC/vA9skci6/PniKPQhlLLyD1geDB rC7i45xNebOWTBfqGzvLIasCUa1tjuINzl7slfDZP2ceBArqQ5QYduxlogaNwolh1WNS t+pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XOguDzLRKEDINzckhKa5fOA6yPf4d73mzyOAKNz4SoE=; b=PiOXTOw2vrqmZ8Va5bnFA0BHYdXQ442nc8KmqRGXIa8FML4Qi6Sg4pE+m5rIkgcAMY apGBK/sOHSKKzMAaNI67A3/KMX0ZwvfvdC1xZSPDwl5gjCSdjREJP4IvDLF6QZp+BCJ4 wv+ZPuOk6LuBNn/Ek/aOM01l8b3uyS+xpPrm4u8bUjUmUPIvjMAaQB+CdpiwzpXVtNOe 7Mh5UGfzLz9NBpP8Pyx9DpC5MfZdMURs1ybN2X6TzAgugse7NY6MUaOBAyn2vKFCxWzI S+NthCYJqzVKoCjsf/jeU6aQ4BIiwlAXcKocTUL/pIR2H7pd0L+NfFr6ZhIQj+Kg0nDG NK8A== X-Gm-Message-State: AODbwcCs/9v/jhtlhL7ncPPENaIToq3c9Q7Wrv0q00DJ8dBdVGGGEyx/ IetwJmoaKkghtA== X-Received: by 10.84.224.77 with SMTP id a13mr92779071plt.132.1496263654362; Wed, 31 May 2017 13:47:34 -0700 (PDT) Received: from kpraveen.labs.blr.name ([103.227.99.58]) by smtp.gmail.com with ESMTPSA id d75sm31798444pfj.75.2017.05.31.13.47.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 May 2017 13:47:33 -0700 (PDT) From: Praveen Kumar To: xen-devel@lists.xen.org Date: Thu, 1 Jun 2017 02:16:52 +0530 Message-Id: <20170531204708.10470-2-kpraveen.lkml@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170531204708.10470-1-kpraveen.lkml@gmail.com> References: <20170531204708.10470-1-kpraveen.lkml@gmail.com> Cc: sstabellini@kernel.org, wei.liu2@citrix.com, Peter Zijlstra , George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, Praveen Kumar , jbeulich@suse.com, Andrew Morton , Linus Torvalds , Wolfram Strepp Subject: [Xen-devel] [PATCH 01/17] rb_tree: reorganize code in rb_erase() for additional changes X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP First, move some code around in order to make the next change more obvious. commit 16c047add3ceaf0ab882e3e094d1ec904d02312d from linux tree [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Peter Zijlstra Signed-off-by: Wolfram Strepp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- xen/common/rbtree.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/xen/common/rbtree.c b/xen/common/rbtree.c index 3328960d56..9826909a2a 100644 --- a/xen/common/rbtree.c +++ b/xen/common/rbtree.c @@ -236,6 +236,16 @@ void rb_erase(struct rb_node *node, struct rb_root *root) node = node->rb_right; while ((left = node->rb_left) != NULL) node = left; + + if (rb_parent(old)) + { + if (rb_parent(old)->rb_left == old) + rb_parent(old)->rb_left = node; + else + rb_parent(old)->rb_right = node; + } else + root->rb_node = node; + child = node->rb_right; parent = rb_parent(node); color = rb_color(node); @@ -252,15 +262,6 @@ void rb_erase(struct rb_node *node, struct rb_root *root) node->rb_right = old->rb_right; node->rb_left = old->rb_left; - if (rb_parent(old)) - { - if (rb_parent(old)->rb_left == old) - rb_parent(old)->rb_left = node; - else - rb_parent(old)->rb_right = node; - } else - root->rb_node = node; - rb_set_parent(old->rb_left, node); if (old->rb_right) rb_set_parent(old->rb_right, node);