Message ID | 20170531204708.10470-3-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 9E1C760390 for <patchwork-xen-devel@patchwork.kernel.org>; Wed, 31 May 2017 20:50:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90BD2284CF for <patchwork-xen-devel@patchwork.kernel.org>; Wed, 31 May 2017 20:50:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83280284DC; Wed, 31 May 2017 20:50:12 +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 A62A6284CF for <patchwork-xen-devel@patchwork.kernel.org>; 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 <xen-devel-bounces@lists.xen.org>) id 1dGAWt-0007ss-Jq; Wed, 31 May 2017 20:47:43 +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 1dGAWs-0007sg-0L for xen-devel@lists.xen.org; Wed, 31 May 2017 20:47:42 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id AC/6D-01733-DEB2F295; Wed, 31 May 2017 20:47:41 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGIsWRWlGSWpSXmKPExsVyMfTAId032vq RBtMfy1ss+biYxYHR4+ju30wBjFGsmXlJ+RUJrBmnWr4wFawSrvh2r5m5gbGLq4uRi0NIYCKj xO27ExhBHBaBlywS545/YAVxJAT6WSVWntgD5HACOXESr9eeZ4SwKyUW/9nADGILCahJbJl3C sr+xSjx9rdHFyMHB5uArkT7rQKQsIiAtMS1z5fBFjALbGCWeLTuFdgcYYEEiUlnX7OD2CwCqh K7Z01gA7F5BWwkdv3ZxQyxS15i0aYZLCA2p4CtxJWuxWwQu2wkFq6fwDaBUWABI8MqRo3i1KK y1CJdQ3O9pKLM9IyS3MTMHF1DA1O93NTi4sT01JzEpGK95PzcTYzA0GIAgh2MF097HmKU5GBS EuWtsNGLFOJLyk+pzEgszogvKs1JLT7EKMPBoSTBu1NLP1JIsCg1PbUiLTMHGOQwaQkOHiURX iZgoAvxFhck5hZnpkOkTjEac1y5su4LE8eUA9u/MAmx5OXnpUqJ8+qClAqAlGaU5sENgkXfJU ZZKWFeRqDThHgKUotyM0tQ5V8xinMwKgnzXgW5hyczrwRu3yugU5iATtm1QxvklJJEhJRUA+P MzvDjvYsi+Qynsu1Rm7e7197V/uuHeRdyNFafKN5hnhT+h9m/Sa3TMnqB2qE9NVItixzjryw2 rfL/llw07eB11h6lXJnEuZd0I/1Zr3poMNU1HNd/u7HGSH/3ooBv7OdeGPe8ly3jcLhkHLGb5 2n7hgPpJ55vkuY+/uvmzvMCF9d5nv3r/FqJpTgj0VCLuag4EQC1omyjuQIAAA== X-Env-Sender: kpraveen.lkml@gmail.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1496263659!101051945!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 4017 invoked from network); 31 May 2017 20:47:40 -0000 Received: from mail-pf0-f194.google.com (HELO mail-pf0-f194.google.com) (209.85.192.194) by server-6.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 31 May 2017 20:47:40 -0000 Received: by mail-pf0-f194.google.com with SMTP id n23so4117048pfb.3 for <xen-devel@lists.xen.org>; Wed, 31 May 2017 13:47:40 -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=9HAVhXJ0HGSRzfizY/p6xoCHgf6TLNSWtGRBPCJJASU=; b=e+vSdw8kkjdM5j9GJZ8ishuxPHgYC0E602tPxM19JQkrGvTCDei+6dBUjw9ioVsB0J nObgRraG8EQLXouWJ5eHNzpc/NR0HjY2Ho2n1I+LL0+qisSVNkMkBuC1dY6lrqp00cxx A52rPJ47wVwljpt8aK1tMR9PfLuHGDoZ+jdM0hba9gh4ITBCMFKtiFcqCHmrQ626a2fB U324SyI6C+LZbXzn0O4rnaTE6htx5wLH3NjX5ctHUwpW7Etiy3GWSdqgWgSqpfwClBQ4 2ObOaa9U5q1WAetgs/alwpik4tZnoo6sYtRhg/65h5qrtrbTaZC+JUshND8TZRzAwwVs ypMA== 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=9HAVhXJ0HGSRzfizY/p6xoCHgf6TLNSWtGRBPCJJASU=; b=GqOkZMx+0UrX9/OBbyIJUFyhA8HYfqfF4cnLUjoVz8gCFWtSLyhqGEbcHKI69oVdat IiD91cuXjsKRh0Q7Sf2NSDRnun6Y3fTVFpEpYnizEZ72vQOqBbg6MaI9+IHWdxPKTz8t KGNBwPA78pFyijizzBcfxQ8a5+f7H1J2pmlBw7AmTNCfvX4o578iR7ehEAU5SDqqer9s EPRIh8Q62gukk+KeyhcpFaKjiJuWcFf2GXv6hRusvIvwuOWc50Bus7QzR9zLAHwEjn7q ovbK/CF8FQ1zSnNzbH/8CaareJgh6kHZXgJ8YMIDUkgAPcGoz3++v6IR+vBi9CjHaIJ0 6KDw== X-Gm-Message-State: AODbwcBaZ/7OaDVwndrMsCVD15sVnvOWOvAcXWCnj2s6AOl9wZSy3zSH KqqAMq1iuk/iRw== X-Received: by 10.84.160.197 with SMTP id v5mr91083211plg.30.1496263658826; Wed, 31 May 2017 13:47:38 -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.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 May 2017 13:47:38 -0700 (PDT) From: Praveen Kumar <kpraveen.lkml@gmail.com> To: xen-devel@lists.xen.org Date: Thu, 1 Jun 2017 02:16:53 +0530 Message-Id: <20170531204708.10470-3-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 02/17] rb_tree: make clear distinction between two different cases 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 9826909a2a..3df599c3cb 100644 --- a/xen/common/rbtree.c +++ b/xen/common/rbtree.c @@ -250,13 +250,13 @@ void rb_erase(struct rb_node *node, struct rb_root *root) parent = rb_parent(node); color = rb_color(node); - if (child) - rb_set_parent(child, parent); if (parent == old) { - parent->rb_right = child; parent = node; - } else + } else { + if (child) + rb_set_parent(child, parent); parent->rb_left = child; + } node->rb_parent_color = old->rb_parent_color; node->rb_right = old->rb_right;