From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754079AbcIUEYs (ORCPT ); Wed, 21 Sep 2016 00:24:48 -0400 Received: from sender153-mail.zoho.com ([74.201.84.153]:25413 "EHLO sender153-mail.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751594AbcIUEYq (ORCPT ); Wed, 21 Sep 2016 00:24:46 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=cc:to:from:subject:message-id:date:user-agent:mime-version:content-type; b=SO72JsdVetiIW7vhTfOINwgT5QvH323YjBkt9oJqSM1mCWTqesL40LjUveLzFgF2tkY4Q/fbuBNN 1hxnSPbar/tqecP8193g+Yl/nffU6zDNJO7N3QrFNiUJeVL9MlOj Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, zijun_hu@htc.com, tj@kernel.org, mingo@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, mgorman@techsingularity.net To: Andrew Morton From: zijun_hu Subject: [PATCH 1/5] mm/vmalloc.c: correct a few logic error for __insert_vmap_area() Message-ID: <57E20B54.5020408@zoho.com> Date: Wed, 21 Sep 2016 12:23:48 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: zijun_hu correct a few logic error for __insert_vmap_area() since the else if condition is always true and meaningless in order to fix this issue, if vmap_area inserted is lower than one on rbtree then walk around left branch; if higher then right branch otherwise intersects with the other then BUG_ON() is triggered Signed-off-by: zijun_hu --- mm/vmalloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 91f44e7..cc6ecd6 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -321,10 +321,10 @@ static void __insert_vmap_area(struct vmap_area *va) parent = *p; tmp_va = rb_entry(parent, struct vmap_area, rb_node); - if (va->va_start < tmp_va->va_end) - p = &(*p)->rb_left; - else if (va->va_end > tmp_va->va_start) - p = &(*p)->rb_right; + if (va->va_end <= tmp_va->va_start) + p = &parent->rb_left; + else if (va->va_start >= tmp_va->va_end) + p = &parent->rb_right; else BUG(); } -- 1.9.1