From patchwork Thu Dec 29 16:10:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13083619 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 B355CC4332F for ; Thu, 29 Dec 2022 16:11:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 87DD88E0009; Thu, 29 Dec 2022 11:10:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 80C8C8E0007; Thu, 29 Dec 2022 11:10:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5202F8E0009; Thu, 29 Dec 2022 11:10:59 -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 24DD98E0002 for ; Thu, 29 Dec 2022 11:10:59 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 0277540E35 for ; Thu, 29 Dec 2022 16:10:58 +0000 (UTC) X-FDA: 80295832638.23.5F3A9B3 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf26.hostedemail.com (Postfix) with ESMTP id 7E83C140015 for ; Thu, 29 Dec 2022 16:10:57 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=mG3Xd47o; spf=none (imf26.hostedemail.com: domain of BATV+e05b48f8d7082ec3c215+7067+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+e05b48f8d7082ec3c215+7067+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=1672330257; 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=/OSTms68IPUXcD9mOyJwWhvTFEvxpirJZnFVgrc7HRI=; b=b7xbr0p7IJSNlf4c8dJtRQQijLekHIIwmke6GYm+fY94VKluF11Fa3M98WJXvvZVYF7Oid NLd34YMJnJkfOI4HoHi4xgrg+ems8I5yK1o65phieqvieAvgMZOXPEXhtTzUDyf2n6D6DF R/yqd9//bl9ucF8w/mF8eGUzzBPNQy8= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=mG3Xd47o; spf=none (imf26.hostedemail.com: domain of BATV+e05b48f8d7082ec3c215+7067+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+e05b48f8d7082ec3c215+7067+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672330257; a=rsa-sha256; cv=none; b=38DaamGxkQQ3Hkkm5JJE1uwaa8M4Ftk2X7+RRXN1LgMjJhydznJhNTn8voOvYNQXi5Lxhy IT5IROaiU3a/6JiCuvKmwQmJ/yQuJuaKErzI4tLyoDs9hQBZWo4nhObVxgvzrihvPIkGnk LMfLclBPaxHeSkPr3BQP+BEn3xlZqtY= 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=/OSTms68IPUXcD9mOyJwWhvTFEvxpirJZnFVgrc7HRI=; b=mG3Xd47oTUQecGZV2lFfDakfTy v9T6b0WubaweFmczUE/fgvx9Ej4TE34uR+iCTgXqcWAZEtr4nOwjmIu7RgbAexm9fF0FQQClyljLk 26JoH5gI1K+5QiVdrRypcrfvoceq4NJW/JTha943AxPSp195deUacqWMuM6Hw4hLbyFsR5+6RgEUA Fn1sHTGv69ttZMtXYF7gIJkwL61CE3QVKLKPdS29QXQgMpfIwoP5p45q41XYs+lhHGRJDhPj5r0sc mLVdGFgskkvDGn9spGCbLcJnva/V2khDSMNj+mzAJRxEDup9kUduZRBnmm9ZYAUWooRXugVtUAP2G kI54fxzg==; Received: from rrcs-67-53-201-206.west.biz.rr.com ([67.53.201.206] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pAvUO-00HKOB-Uf; Thu, 29 Dec 2022 16:10:41 +0000 From: Christoph Hellwig To: Andrew Morton , "Theodore Ts'o" , Jan Kara , Konstantin Komarov , Mark Fasheh , Joel Becker , Joseph Qi , "Matthew Wilcox (Oracle)" Cc: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, ntfs3@lists.linux.dev, ocfs2-devel@oss.oracle.com, linux-mm@kvack.org Subject: [PATCH 5/6] ocfs2: use filemap_fdatawrite_wbc instead of generic_writepages Date: Thu, 29 Dec 2022 06:10:30 -1000 Message-Id: <20221229161031.391878-6-hch@lst.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221229161031.391878-1-hch@lst.de> References: <20221229161031.391878-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: 7E83C140015 X-Stat-Signature: qqfc43aii6tqnqj49gwhxd5zhj1kdbxt X-Rspam-User: X-HE-Tag: 1672330257-396984 X-HE-Meta: U2FsdGVkX19Yrclz+unhbdPQkT+v2Xdmz+7Vlb/PcirYKhWeckGNlEvibo0xmXLsP6tI3s/ouIJExhtkjoOms6kLSDv2P7PUuuUS1mzBGTJbtWt2PANo6LVk4caODE0HNcoajXUd7AfI0kW3UKuApR7phQ1JRLVOQt+ob8Hn7EfxuwIAx0EmPU/NQ4qv5SFWLWasGlBZOvpAGFNfqlNShsESLkMp/LjGwsArPnR3tIhP2xJWFdKrUAEPIGhB1EsCF2Z0V9Ki2AWc/ddz1I01iUqIleLNvn6ff62/r8c/EeXSVaZ3huWu9NgMrgqxpgZpbi7x57S5qemCN0GnX5JH9f+rngBeLYqQ2nGLxAV+EJSQqpaqmebPiWTC3BcaU2g+gaDKVzS4OXzBDYUjErl4KoLQAbPM546TbrlpRBJyVbrkMWumuKkPHqUZ1HwZuc0Wn8mqVGYfCVYa6SLOTNVfqx7Yp+DgQAWW9ngjChXpFMTHyeUePT1ERDxP2UoTIJXSrpmni+ZnuCHTTiE/TCBzww/UeaIe+AbyMjwC8QVB1F5NpzFsLDreVDhMY2Pg6GyilWrBBdjlHU7utymdNY9rHIdN+gvjV2o3QazbGNeKNPXsKTYWfUc5rAm5Lv9y+pSYQeeY60dh2EpSE6bSFvdmtfq66YLsoNRxe4NmS+V3maHbDwIi2tph1314xpUzID5R6MBEGPw7ycg7BKULhcyDpvyYOoylX19uoEad9mUY6guV2WAAHW/9I/7Xii8AiHAJlwQUT3/rWxm7cFPX6stuzxAmQU7uB+B510uc5w1ipNHCso8HHqmjdaS2p8RD0zqapglRJ3jhMZQZPIweQQ+oNEJQyNP0poKfHCoeWpM7pI199lU5dWKa1zR5wSqAW0hdq/Xl+luTH8PsUOnNkJw75sRk1x56YlmUJ68gYN4gZCVnAM+2Fjylf++JK3FM2lqPPEjjcWke521SEAyoRgZ 0DQsFsHz ZDZxUsyOFyIXTM4aXlAuZyBu2GphsFMkcNwJQHvL7jOym9rQcf2TJ5pweTkIi0aN3u+4irLPl0TNGeYsyNtxf/YHYJ49HCahOBvlwGrX7Gl46mq7qocjTWmgo3wEjSk/3mL4lYuaA9/d48yvEKcDqLDDHfJ2813CQD48QE38SNs2diZ5y0S15ozUSk1/5i+/8w6mFSL9vjqeDEdr+gdxEcKILsbwuk4O6v6miH/yaLPm5bGU= 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: filemap_fdatawrite_wbc is a fairly thing wrapper around do_writepages, and the big difference there is support for cgroup writeback, which is not supported by ocfs2, and the potential to use ->writepages instead of ->writepage, which ocfs2 does not currently implement but eventually should. Signed-off-by: Christoph Hellwig Reviewed-by: Jan Kara --- fs/ocfs2/journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index 59f612684c5178..25d8072ccfce46 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -852,7 +852,7 @@ static int ocfs2_journal_submit_inode_data_buffers(struct jbd2_inode *jinode) .range_end = jinode->i_dirty_end, }; - return generic_writepages(mapping, &wbc); + return filemap_fdatawrite_wbc(mapping, &wbc); } int ocfs2_journal_init(struct ocfs2_super *osb, int *dirty)