From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3254FC64EC4 for ; Wed, 1 Mar 2023 02:27:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229748AbjCAC12 (ORCPT ); Tue, 28 Feb 2023 21:27:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229617AbjCAC1Z (ORCPT ); Tue, 28 Feb 2023 21:27:25 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 026A5136DE for ; Tue, 28 Feb 2023 18:27:25 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-536bbaeceeaso251642447b3.11 for ; Tue, 28 Feb 2023 18:27:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1677637644; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=d/02ba9pKPs+xaeDNoqwdk3OeXtfhs3eb+vbTt5q+ds=; b=jwkVCM8M/VdQLhfCkuQxzR9SFY68aOcPkmEc06SJ6jbXq0SL8vhpoeNFFcc2FIMX4Z qOAOI7yp7551oLwvyh9mgMAkw383CXCX5b/h08MQxyDTWLFQM302VK4PCxZW4njJU5wA w8EcBp5F7o/S81X59PWPM2wdZuE0ddMRfvLTZfdeoGxlABs9nXf5/tfjdeYbhTyrLwWT e+FKJlhxrRgP+4+FF7t+gW+oCtxdSoeGJUiUlZqGApiO7FNDs2PJNRAhZDwX5gfdv5E5 1eq6ilJ6KGu4P83kvjayRhSH9oLzyJQNHlvbOeaMFbtv/Mp7aqikHM/ZQ07xCIiTbr5t l13g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677637644; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=d/02ba9pKPs+xaeDNoqwdk3OeXtfhs3eb+vbTt5q+ds=; b=mgDo75/zF6I62CW6ecIa9lGI1UZ45ifgAPCcBYYTBnB/efq0h1Qc8XVxVprFgnmqTO yVRmhTNqmknne7yRSWvi+pWb/gd8Jdy/mFLIS7YYgUjI3BQ69eex0wk8FnAJXciTwwg1 ShEz7EOhokRBDkErCmjh8LBqRne/SiznvYirBZ5XCQiTYFmg8Z/hkzystZP0z1Sbh6I1 2/d8kNQX/RtJmhJm6pXIl9jGWD8aAB8Y2hGHplHPNgyUrFxARgDnIdiUaCbPC7jTWfCA E9wcPmDXrn73c2JirAYwulkG8a9IuUNNNdR1a7HnU+Z+alAzOFEcYvW5qkxnLrZIdNUj xx7Q== X-Gm-Message-State: AO0yUKUH7SkxdD6hwUpU4dJy5DUsSP0laHZPJs4ODd78xXS4an5Wwlvx 2tCM4Ffws8MV9bj6pVO0qisu/OMfbCA= X-Google-Smtp-Source: AK7set+61/MW3yRA90mpctcsE10D/EizwukiJmPOyOpLJRZveGe/foy6L1qBI9eSafdW1SJNmwf3gt5vepg= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:200:612b:820a:2225:ad82]) (user=surenb job=sendgmr) by 2002:a05:6902:50e:b0:967:f8b2:7a42 with SMTP id x14-20020a056902050e00b00967f8b27a42mr2156872ybs.7.1677637644274; Tue, 28 Feb 2023 18:27:24 -0800 (PST) Date: Tue, 28 Feb 2023 18:27:19 -0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.39.2.722.g9855ee24e9-goog Message-ID: <20230301022720.1380780-1-surenb@google.com> Subject: [PATCH 1/2] mm/mmap: remove unnecessary vp->vma check in vma_prepare From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: sfr@canb.auug.org.au, error27@gmail.com, willy@infradead.org, david@redhat.com, Liam.Howlett@oracle.com, jgg@ziepe.ca, yuzhao@google.com, dhowells@redhat.com, hughd@google.com, mathieu.desnoyers@efficios.com, pasha.tatashin@soleen.com, laurent.dufour@fr.ibm.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, surenb@google.com, kernel test robot Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org vp->vma in vma_prepare() is always non-NULL, therefore checking it is not necessary. Remove the extra check. Fixes: e8f071350ea5 ("mm/mmap: write-lock VMAs in vma_prepare before modifying them") Reported-by: kernel test robot Reported-by: Dan Carpenter Link: https://lore.kernel.org/r/202302281802.J93Nma7q-lkp@intel.com/ Signed-off-by: Suren Baghdasaryan --- Fix cleanly apply over mm-unstable, SHA in "Fixes" is from that tree. mm/mmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 0cd3714c2182..0759d53b470c 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -505,8 +505,7 @@ static inline void init_vma_prep(struct vma_prepare *vp, */ static inline void vma_prepare(struct vma_prepare *vp) { - if (vp->vma) - vma_start_write(vp->vma); + vma_start_write(vp->vma); if (vp->adj_next) vma_start_write(vp->adj_next); /* vp->insert is always a newly created VMA, no need for locking */ -- 2.39.2.722.g9855ee24e9-goog