From patchwork Thu Mar 2 23:27:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 63659 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp127233wrd; Thu, 2 Mar 2023 15:45:28 -0800 (PST) X-Google-Smtp-Source: AK7set/pH1Lbyo6pO2nh6q6JKvpSCdCkgX9vHqaTiXsnFjsJOnEVcPWUZzVIXCVeX95L3x2Evvdc X-Received: by 2002:a05:6a20:4a1d:b0:cb:9bd0:7ee2 with SMTP id fr29-20020a056a204a1d00b000cb9bd07ee2mr132602pzb.45.1677800728650; Thu, 02 Mar 2023 15:45:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677800728; cv=none; d=google.com; s=arc-20160816; b=Otdg7Nm1pgxndZcP05/bS3v2ScEShspkLb6sGLrs1BzscD+/BW7ew3GL6hn1o35DVi 5qlVFWAc/hCfnYaMdVqff1IzNH1dXLcRpzT54JzdfgrMjCAQvq9QTWeBx1E82LMAYzim 4udqoML5tzMvAGF9DcILpWBYMlTnqf8wuEWQ3sftcMTJrjTzSAYKNPNaFrZQd2P4z+/8 t/Gb5is8zL8Xj65GQ/LoZMz3NHTE+tZvDZSTjppkpU0Z6UPI6shf6WlNo83XlRmpX3Ue /wke8BEx1dQBQPsS8+bqbEMn2i6D38LJrQlpJtUhLSutOi3QzU/S7NwQevSlh83jmo34 Q2Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=X3niQqWSDaRdijh0GPlKHY1yoysmmoQVBPzADYFTAAk=; b=isMNhKziaLTjgdg/r5kWmJrAMO5OS3R9WadXcK8UkUwE3MaX4fbhJ8W52H8ydjTxB0 Yu7ZBwdFyxK3yah4R0xsgI7zIoVamcXDfH8I3eeMxI4p5a56/BGzED4vNGWF24yTkwcT +hgMPXvpk0DNFXp36DlIleNJ0+Jnn9rQ0Uy7ixTZBVOX9sdOBT78UP+KNp52nCUhM7mI 4a8rnC2DjRJNgwGtBoEOsnFH9P5rOyR/tw0NuSUykzLdsdqAza7qp+0l8zwGSUJWD5gK pU8uTGqEK2sHVXJYz4HqGQWWrBoYDzYcWX5fIwIW84Dzf2MlUDY41tblzSDFGLvFOvqQ PuyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="A1T9i9l/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w4-20020a656944000000b00503a0139e29si481291pgq.688.2023.03.02.15.45.14; Thu, 02 Mar 2023 15:45:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="A1T9i9l/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229983AbjCBX2Q (ORCPT + 99 others); Thu, 2 Mar 2023 18:28:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229728AbjCBX2L (ORCPT ); Thu, 2 Mar 2023 18:28:11 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 458872693 for ; Thu, 2 Mar 2023 15:28:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=X3niQqWSDaRdijh0GPlKHY1yoysmmoQVBPzADYFTAAk=; b=A1T9i9l/KhB0qQZfQ43uw6v8kl DTCTRWDp8ClUN+kK4tmCnmWxFQZNAu7/KlswhmxIBSNnubcoAF/0v32hcIh7vsx/2fYebdrGuOFfD cAnCJAhSbnS1joVOILJsNws5NnKu+5mYSq1Eg2EeWdf/r2/gWG/2PiHtkicrXr4nv4g8KNvqyd+h5 zSb4BZm/8ekQ3nBFaKCQSpzvzbNAJor5LMWh0xvyjEChMKRIwSW6QtvSbE5HH6mk+eiwxMNN1wRYL NN7yYd8Xgu8+6Yqm6vtCggq8UsMK7X8LuLapwpCc3bG7p2c7yZG4p+iTMZohqzaupylW/idKcbw0L a/8QUp7w==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pXsL9-003j3I-3W; Thu, 02 Mar 2023 23:27:59 +0000 From: Luis Chamberlain To: hughd@google.com, akpm@linux-foundation.org, willy@infradead.org, brauner@kernel.org Cc: linux-mm@kvack.org, p.raghav@samsung.com, da.gomez@samsung.com, a.manzanares@samsung.com, dave@stgolabs.net, yosryahmed@google.com, keescook@chromium.org, mcgrof@kernel.org, patches@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/6] shmem: remove check for folio lock on writepage() Date: Thu, 2 Mar 2023 15:27:53 -0800 Message-Id: <20230302232758.888157-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230302232758.888157-1-mcgrof@kernel.org> References: <20230302232758.888157-1-mcgrof@kernel.org> MIME-Version: 1.0 Sender: Luis Chamberlain X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759301577121824006?= X-GMAIL-MSGID: =?utf-8?q?1759301577121824006?= Matthew notes we should not need to check the folio lock on the writepage() callback so remove it. This sanity check has been lingering since linux-history days. We remove this as we tidy up the writepage() callback to make things a bit clearer. Suggested-by: Matthew Wilcox Signed-off-by: Luis Chamberlain Acked-by: David Hildenbrand --- mm/shmem.c | 1 - 1 file changed, 1 deletion(-) diff --git a/mm/shmem.c b/mm/shmem.c index 1af85259b6fc..7fff1a3af092 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1354,7 +1354,6 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) folio_clear_dirty(folio); } - BUG_ON(!folio_test_locked(folio)); mapping = folio->mapping; index = folio->index; inode = mapping->host;