From patchwork Wed Jan 18 17:30:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13106733 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00E0FC54EBE for ; Wed, 18 Jan 2023 17:31:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7EF656B0081; Wed, 18 Jan 2023 12:31:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 777CA6B0082; Wed, 18 Jan 2023 12:31:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 640BB6B0085; Wed, 18 Jan 2023 12:31:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 4F42A6B0081 for ; Wed, 18 Jan 2023 12:31:04 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 338A01205DA for ; Wed, 18 Jan 2023 17:31:04 +0000 (UTC) X-FDA: 80368610448.20.90650AB Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf15.hostedemail.com (Postfix) with ESMTP id A6FAAA000B for ; Wed, 18 Jan 2023 17:31:02 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b="t/tZrpSS"; spf=none (imf15.hostedemail.com: domain of BATV+aec3eaf5b774c69d00f8+7087+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+aec3eaf5b774c69d00f8+7087+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674063062; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=jmbxaw5WGTdQC+qZyQllTG4rSUOzrNtp0wkWOB0SkzU=; b=pLC6XII/SC7KIA2WNI1HLqa3mv9IQqCh+x5sWFUmZnS05zmKGb60yzhKkQPyPXMyfNhUD+ T3F05SFxXZhci7fyDlf0frNsV5i9AmZudt/xFcRj81aKkWRRtS4OKPzVjkg/3AGdpI+4uM 0hGkwlda7SjgZPOh1jgR08BjBcJ4QQE= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b="t/tZrpSS"; spf=none (imf15.hostedemail.com: domain of BATV+aec3eaf5b774c69d00f8+7087+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+aec3eaf5b774c69d00f8+7087+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674063062; a=rsa-sha256; cv=none; b=h3C/j4AJ5PUt8EcYfUAhPU2ZkEcwMEIM9V2FN1A6QJJR45fjp7IGhDyCEmDzUdm09tJhl5 Ej4CjZhsOOO7v8l1F8zr9m9LUyi99de24XNb2DMdvhcrC/SSzeJYEdknCPpkLuyAkxg6tt 8IGfvq/B1m9ZCiU5iw7YzmcX9c19GZA= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=jmbxaw5WGTdQC+qZyQllTG4rSUOzrNtp0wkWOB0SkzU=; b=t/tZrpSSAGJENEbey1iuxkY4ry DoU5y3Z4+8vXJK7yr+FX15ymQN81I4eYh+Ld5EsZ7QFqEDndjQwJk3U4pvySdS91GPbZqgEuJzKSc 3Hb+U6bsZh23jwkljYJIRJmeZmhtzKFA2xT/JLlfnDFLQzDCMBk0IwTSypcYjKrwmJgSb/gtP6Pxa vqIncS8uYulKZFlO9T7OpTj0BhbtHHGYpqhOlGXM2HT8Jx9qfzXF+bD/vDHXBFJZqpMAlFvudD4WT VHRCcgIEGkyXvIQnY4XTtcmPCC5sJHR2bvvK4vMMsHKgWPKo5D6SKWZhgAk4rd4Vnl+qQfpUU3NGd DadoCs/w==; Received: from [2001:4bb8:19a:2039:cce7:a1cd:f61c:a80d] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pICGx-0022Gg-Pc; Wed, 18 Jan 2023 17:30:52 +0000 From: Christoph Hellwig To: Andrew Morton , Mark Fasheh , Joel Becker , Joseph Qi , Evgeniy Dushistov , "Matthew Wilcox (Oracle)" Cc: ocfs2-devel@oss.oracle.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Jan Kara Subject: [PATCH 7/7] ocfs2: don't use write_one_page in ocfs2_duplicate_clusters_by_page Date: Wed, 18 Jan 2023 18:30:27 +0100 Message-Id: <20230118173027.294869-8-hch@lst.de> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230118173027.294869-1-hch@lst.de> References: <20230118173027.294869-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A6FAAA000B X-Stat-Signature: 66pwd638tbzwwey99kw6ibpegnzwu9ya X-Rspam-User: X-HE-Tag: 1674063062-204456 X-HE-Meta: U2FsdGVkX18aZbi3sR6ezFeDvwkmhV7EPobox3CffXoUYkLtNtH1Wm0rQIOgsaN8s3krKUsk/9R+meliWxUGFQbH771UswVTKuKhDzQx4+H228cx/CfcGgpFIjeK8sLzZCxLBx8xpArGOPDCIuzSwAT5Yxb6JeF4B3gjU8fxPP84jMd5QuZ/LiN4JvmMBnMENXpqGzsMfPdd0WN3iEz238Hc2M6A1iccxeik9GDi/KvHEfsv6cUKdbCyMEVi4rjqL+INB6ArqG2quJE69Jh+xtI183pTnUnULm/bNPTvzlLwALgQ0vsUGfchaiVGTXeu/pEsBHB6MxWgMSiBVT19kb4o4fBCmVf5gvHbz2LPtFXFBgcKq9uLxJNUsQXgThLAmRG0HaDMrZ9fFcelH7REIjHYAuaYiQVlBMc6gwctEk+fQJ0sdVlg2PukzqJSdB0oLTFqPKV4rnFxnB1n+IVlba3yKC6DSIJ7vmpAaP7hyVa0AmIGfpJN+l/XV19GSmRAESIzYh5mjRzRpzar2ArJySWgeWU4wUpaubiQA/Zu68jbWU53/HxhOkrJn/rbwBvRgarNXxsXLvpQhJhx75Vqm2YZVAzbSwH5zm2e8lxJycMI0jwFKMxzBlBesCvx+oJbJFzBood5p8GMAgiB56gEsyjKW/yK9Mzpc32gkqGAjQjUD5j4yrLlgrZXa/Or9KqOSqllE1slRVn+xiLTItWXWkGBztqSL81OEOV1VnBFiDghkEi7+7rMQZz+dcbvC1r3JbXQWSLKxtfxGoIDFIVm2yAC5JA5hXP6FylkzHYH2mm+fyUXqbYveT6xazf1eE44a2HAvmCt+uSYhmTjV1UvZfwqgqexqk2NdVelagcfehhI6ufjpKWJiWoZJ/W34M/dpxiVttkaPj+Gy3OyhpfYfv75MDcpc063UBj08/gZMqo2EhL6G1Z3OvCtQoNJMAnpmiQJEtKXvZub+rGxRf2 fUQsVrl3 Vm83oCKGhI7u5mo8DzAQtKGO7pjGxVqJDk9IW/zfUmtFRC0OzjBDxiMtpPsi3hqwMyRHj1efD8GbiK9EpSvViu4dp5W8v/TA7sUtEXZgwGz3PMEGLFELYDur/Y2DIhZbkOUTX3+DLqGng0bxEuMiMlPhd6g45jiVmMPhWyRPoEQEBwKJDLEcb9MttgtUEn8Ykx6ptSoOElfDEks9dT9+h2nwIc0oa8vzh9zS+CllDEcEEwBI= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Use filemap_write_and_wait_range to write back the range of the dirty page instead of write_one_page in preparation of removing write_one_page and eventually ->writepage. Signed-off-by: Christoph Hellwig Reviewed-by: Jan Kara Reviewed-by: Joseph Qi --- fs/ocfs2/refcounttree.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c index 623db358b1efa8..4a73405962ec4f 100644 --- a/fs/ocfs2/refcounttree.c +++ b/fs/ocfs2/refcounttree.c @@ -2952,10 +2952,11 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle, */ if (PAGE_SIZE <= OCFS2_SB(sb)->s_clustersize) { if (PageDirty(page)) { - /* - * write_on_page will unlock the page on return - */ - ret = write_one_page(page); + unlock_page(page); + put_page(page); + + ret = filemap_write_and_wait_range(mapping, + offset, map_end - 1); goto retry; } }