Message ID | 20171121152009.15591-2-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 7A7CB6022E for <patchwork-xen-devel@patchwork.kernel.org>; Tue, 21 Nov 2017 15:23:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C34729761 for <patchwork-xen-devel@patchwork.kernel.org>; Tue, 21 Nov 2017 15:23:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6102E29775; Tue, 21 Nov 2017 15:23:09 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, 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 903F129761 for <patchwork-xen-devel@patchwork.kernel.org>; Tue, 21 Nov 2017 15:23:07 +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 1eHALm-00006V-Db; Tue, 21 Nov 2017 15:20:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from <kpraveen.lkml@gmail.com>) id 1eHALl-00006P-GQ for xen-devel@lists.xen.org; Tue, 21 Nov 2017 15:20:37 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 80/C1-04145-444441A5; Tue, 21 Nov 2017 15:20:36 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrOIsWRWlGSWpSXmKPExsXiVRvsqOviIhJ lcGM7t8WSj4tZHBg9ju7+zRTAGMWamZeUX5HAmtHR28ZUsJWn4sPVO2wNjK84uxi5OIQEJjNK XHzwig3EYRF4ySLR0vQczJEQ6GeV+HXjEmsXIweQkyXx5bMKhJkmcXBHdRcjJ5BZLXFz31FWE FtIQE1iy7xTzBBD3zFKbH20gAWknk1AV6L9VgFIjYiAtMS1z5cZQWqYBb4zSqx5PwWsWVjAX2 L1h23MIDaLgKrEm7mPmEBsXgEbiaezfrFDLJOXmPauF6yeU8BW4tLBT2wQi20k/s19wjaBUXA BI8MqRo3i1KKy1CJdI0u9pKLM9IyS3MTMHF1DA1O93NTi4sT01JzEpGK95PzcTYzAgKtnYGDc wXh5i98hRkkOJiVRXklTkSghvqT8lMqMxOKM+KLSnNTiQ4wyHBxKErylzkA5waLU9NSKtMwcY OjDpCU4eJREeFudgNK8xQWJucWZ6RCpU4yWHPv23PrDxPFs5usGZo5pV1ubmIVY8vLzUqXEeV 1B5gmANGSU5sGNg8XnJUZZKWFeRgYGBiGegtSi3MwSVPlXjOIcjErCvIIgU3gy80rgtr4COog J6KCfx4VBDipJREhJNTAe913EWs3hbKUZm8q4zpeJI+/K00ojAYMt8jNCVr92X1ay8zAHE/Ov ayIMQtbv3qy/xp/Ps+PYbMeIdNVtZ6YfOLonyuHu59Q/of9P1lv+7/v4XzzE+r4qW0SVZgS7z 4ZIkw/Rr0Vm7Ew3/rN2jmGLAgfb7611Sas+G2v0Cys1KcXkztgxj0OJpTgj0VCLuag4EQDDUp 1SygIAAA== X-Env-Sender: kpraveen.lkml@gmail.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1511277635!79741307!1 X-Originating-IP: [74.125.83.65] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58183 invoked from network); 21 Nov 2017 15:20:36 -0000 Received: from mail-pg0-f65.google.com (HELO mail-pg0-f65.google.com) (74.125.83.65) by server-10.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 21 Nov 2017 15:20:36 -0000 Received: by mail-pg0-f65.google.com with SMTP id c123so10384839pga.11 for <xen-devel@lists.xen.org>; Tue, 21 Nov 2017 07:20:35 -0800 (PST) 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=9Mt9sOFW7mFh870rVHVUZczfiLJLVP+HQxVuJwrp9CA=; b=Tf2cw1TUYaZRXbn2JRbOex2gpXOmdlGvURUD7ijnGm/0GgGEO+k2+CdGujCrBOY1P2 mBxktYzEmWYbNgtAobteOpmghq0/9+oIcDeTxy2Ie6ojh7bX9idcds3JudGuToNtq48O qrYTd+NzLFTCHeyOMy4WOTIvDajmCt3kcCB3n2069VjOZWbfNTBpP4whmKbUajVpxjRM MgH9usMOLjcuLnMjzIgJRt0u5BXQVU4lloNFm4+A0JfRuepWsjZpXMPma4MzwPdBvpcu HqdknLrwWXZh1gprethpKt5f+sVMNNPiAdCcn7DuUgGj0XR214EL7QHZhqkAlmDZUTgy 9SVQ== 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=9Mt9sOFW7mFh870rVHVUZczfiLJLVP+HQxVuJwrp9CA=; b=GKvP/y7VCU88i+VR5/5q2WveftsXkFc9f7KaesMHZh/eKSTIafREgQJo6IEwZoY8TK n5htCn1eau6q6KK1vindm+qaoP4/ekrKRPETGrqnBmDVEeD1NSOT0A4/fzAurn7mFxU2 tw6Hp4U/A0xaxH8lXkZoFAilO5DNIiw6WnMsStuLq6v8nqfu7XaGUXvbc7gSS3N9cYvh faSo0GrAnXeQ+RQujBjmZmUMANBm/6Ry21yuJS0Rf9KGDUXGoulDrivwJbvMkkO48IOw TnF6VX7cd0ImAH1gPgigFS8dBTyWo+yIN2DJRQ9ALktOmKqYLQljrYSf6ZZKxEpkGElJ jcuA== X-Gm-Message-State: AJaThX4Tz836b/q1FuBGoEJTcBdNwLOgwOROz6G/pn+h755fteSobL7L HwV5EoaodSC45xCYdNHjo0jOIw== X-Google-Smtp-Source: AGs4zMbyWCrwz95PGc/hHGxZSHZ+8f4oZM5Y2AG5U2kJEnjfSSlfXHvENGQZPWah7Ww2EYO5Q8H3KQ== X-Received: by 10.98.196.155 with SMTP id h27mr15575632pfk.137.1511277634465; Tue, 21 Nov 2017 07:20:34 -0800 (PST) Received: from praveen.name ([106.51.29.204]) by smtp.gmail.com with ESMTPSA id 3sm26905504pfo.17.2017.11.21.07.20.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Nov 2017 07:20:33 -0800 (PST) From: Praveen Kumar <kpraveen.lkml@gmail.com> To: xen-devel@lists.xen.org Date: Tue, 21 Nov 2017 20:49:54 +0530 Message-Id: <20171121152009.15591-2-kpraveen.lkml@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20171121152009.15591-1-kpraveen.lkml@gmail.com> References: <20171121152009.15591-1-kpraveen.lkml@gmail.com> Cc: sstabellini@kernel.org, wei.liu2@citrix.com, konrad.wilk@oracle.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, kpraveen.lkml@gmail.com, jbeulich@suse.com Subject: [Xen-devel] [PATCH v6 01/16] rbtree: 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 167ebfdc4d..62e6387dcd 100644 --- a/xen/common/rbtree.c +++ b/xen/common/rbtree.c @@ -250,15 +250,15 @@ 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; }