Message ID | 20170531204708.10470-4-kpraveen.lkml@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <xen-devel-bounces@lists.xen.org> 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 7232260390 for <patchwork-xen-devel@patchwork.kernel.org>; Wed, 31 May 2017 20:50:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 653462844E for <patchwork-xen-devel@patchwork.kernel.org>; Wed, 31 May 2017 20:50:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59D57284C4; Wed, 31 May 2017 20:50:16 +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 0C495284CF for <patchwork-xen-devel@patchwork.kernel.org>; Wed, 31 May 2017 20:50:16 +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 <xen-devel-bounces@lists.xen.org>) id 1dGAWx-0007tM-RO; Wed, 31 May 2017 20:47:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from <kpraveen.lkml@gmail.com>) id 1dGAWw-0007tD-F7 for xen-devel@lists.xen.org; Wed, 31 May 2017 20:47:46 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id BD/43-19409-1FB2F295; Wed, 31 May 2017 20:47:45 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGIsWRWlGSWpSXmKPExsVyMfTAEd0P2vq RBrPOWVss+biYxYHR4+ju30wBjFGsmXlJ+RUJrBlv3vcxFVzjrjj5/y57A+N+ji5GTg4hgYmM Emu3aXcxcnGwCLxkkfj9/x0LiCMh0M8qsWPjQxaQKgmBOInlT7cxQ9jVEr+3bWOF6FaT2DLvF DNIg5DAL0aJhQtb2bsYOTjYBHQl2m8VgNSICEhLXPt8mRGkhllgA7PEo3WvGEESwgK+EvcOnm AHsVkEVCUuPZ4BtoBXwEbiYNcuqGXyEos2zQA7glPAVuJK12I2iMU2EgvXT2CbwCiwgJFhFaN GcWpRWWqRrpGRXlJRZnpGSW5iZo6uoYGxXm5qcXFiempOYlKxXnJ+7iZGYGjVMzAw7mCcesLv EKMkB5OSKG+FjV6kEF9SfkplRmJxRnxRaU5q8SFGGQ4OJQleVy39SCHBotT01Iq0zBxgkMOkJ Th4lER4r2gCpXmLCxJzizPTIVKnGI05rlxZ94WJY8qB7V+YhFjy8vNSpcR5u0AmCYCUZpTmwQ 2CRd8lRlkpYV5GBgYGIZ6C1KLczBJU+VeM4hyMSsK8KSBTeDLzSuD2vQI6hQnolF07tEFOKUl ESEk1MLLMql0jriL7Ov0Z/3LOIiWWBj7xDwmchau1Xd7qLTB40qn3Y/fXqRq3pVJPbNzbFnxv 5wYZWzmXAHkpraCzVdOcXW2PtKw+9+iZe8Sqd0ErrfV8drW765paf3k/u3cJ97bzmzMU7S0i2 Ox1177Kaa42fVq2wF7+luxFKZ8LzS9kBKxuGcmuVmIpzkg01GIuKk4EANqKHFu5AgAA X-Env-Sender: kpraveen.lkml@gmail.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1496263663!64913506!1 X-Originating-IP: [209.85.192.196] 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 41323 invoked from network); 31 May 2017 20:47:44 -0000 Received: from mail-pf0-f196.google.com (HELO mail-pf0-f196.google.com) (209.85.192.196) by server-6.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 31 May 2017 20:47:44 -0000 Received: by mail-pf0-f196.google.com with SMTP id n23so4117313pfb.3 for <xen-devel@lists.xen.org>; Wed, 31 May 2017 13:47:44 -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=rhEOW0urIvdci9z3EBpgBjdl9lrO1NQD2bvwn1K6DkU=; b=oFo7/6xDB2A54ohceljTB3kekUak8aS41s+M1pEs5ZLoQfuMyEWPOICTD8OJQ8Jw/J +4Z8vvTQBaXeMukQl8/B8divbfncpjWG4naifssempozYaRvJ+iQ12Zf8j18vhDQ21P9 XXqKUhy0j4ajBu5OxZWsBfnvelMGCETU4jUDaaW3xolXwPGRIOfQRSgiYH/ne2cVH9sM MiNnXwBhmw74N9TVoFJBUyi5HJXjFcgk/loGyozk7HfcDEDUlEBWsGefzWfl2/rzQHeg KZtJt9mOJpILhsF6R7SI3c0HnUGJu/xmjl6wW44Vaz08UTIph6KBcvt18cu84B3TDWn1 V7pA== 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=rhEOW0urIvdci9z3EBpgBjdl9lrO1NQD2bvwn1K6DkU=; b=MYj//UPrye7j48Cn7QeXuCjJmmspJH0AkrbIdiuZ8698xyzoYa/Hmde/6G4fhuDZGu DrvNIzjpQ/CbAKlSc02tFNPNBQTdGCOkH0yGrSRo+0hIHpELDbpdZJnjrtalmn3w+K1M 3n1s3PLsjzvEDS/c5lkyUePnTXFn/3PcIlIqhTmg61w+A1QwaMrcNUP8Daa1bhAm08na pC9J1y50mp+xQv2CxQGfiTf1ObwMhU1aSZhHq3jEE8i38dOHircPCJZy4H1a+SPR/34C cm0aMHMuIrslvlvp+hRXbM4chlC62ffMlXK00VPo2cTFlSu4X2Nh8f6vGP7EuoQuOjJf 1K3w== X-Gm-Message-State: AODbwcDfZsoxG4oeOwwo86rXjGO6hxbIxFc6IKPCv0TA80uxYhzMSlQ4 AGkH/hJ8gEF05Q== X-Received: by 10.84.232.141 with SMTP id i13mr91644717plk.143.1496263663197; Wed, 31 May 2017 13:47:43 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 May 2017 13:47:42 -0700 (PDT) From: Praveen Kumar <kpraveen.lkml@gmail.com> To: xen-devel@lists.xen.org Date: Thu, 1 Jun 2017 02:16:54 +0530 Message-Id: <20170531204708.10470-4-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 <a.p.zijlstra@chello.nl>, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, Praveen Kumar <kpraveen.lkml@gmail.com>, jbeulich@suse.com, Andrew Morton <akpm@linux-foundation.org>, Linus Torvalds <torvalds@linux-foundation.org>, Wolfram Strepp <wstrepp@gmx.de> Subject: [Xen-devel] [PATCH 03/17] rb_tree: remove redundant if()-condition in rb_erase() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion <xen-devel.lists.xen.org> List-Unsubscribe: <https://lists.xen.org/cgi-bin/mailman/options/xen-devel>, <mailto:xen-devel-request@lists.xen.org?subject=unsubscribe> List-Post: <mailto:xen-devel@lists.xen.org> List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help> List-Subscribe: <https://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xen.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" <xen-devel-bounces@lists.xen.org> X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/xen/common/rbtree.c b/xen/common/rbtree.c index 3df599c3cb..0695edd9f9 100644 --- a/xen/common/rbtree.c +++ b/xen/common/rbtree.c @@ -256,15 +256,16 @@ void rb_erase(struct rb_node *node, struct rb_root *root) if (child) rb_set_parent(child, parent); parent->rb_left = child; + + node->rb_right = old->rb_right; + rb_set_parent(old->rb_right, node); } node->rb_parent_color = old->rb_parent_color; - node->rb_right = old->rb_right; node->rb_left = old->rb_left; rb_set_parent(old->rb_left, node); - if (old->rb_right) - rb_set_parent(old->rb_right, node); + goto color; }