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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CE22C61DB3 for ; Mon, 9 Jan 2023 05:18:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F93F8E0007; Mon, 9 Jan 2023 00:18:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 354D48E0001; Mon, 9 Jan 2023 00:18:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA4628E0009; Mon, 9 Jan 2023 00:18:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A12858E0005 for ; Mon, 9 Jan 2023 00:18:22 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 773AC1202AA for ; Mon, 9 Jan 2023 05:18:22 +0000 (UTC) X-FDA: 80334104844.06.58DF925 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP id 85200A000A for ; Mon, 9 Jan 2023 05:18:20 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=mKbzCkts; dmarc=none; spf=none (imf25.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673241501; 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=lzB774qlWOGeuLTuMSFQPkmJwRXTwSiLN6M5EhwWaoI=; b=p/BVuyZBbRnIbWKGNGN4QZGXZjyCa+ra+R+1JlXofxnPe1LMBNfzKwqHW3engE4gXcAC1r 2613IHayPP04+aFXtKHtym2v1RlsB6geJukkDDR+IDRrUpzuBBk9R7OnBC2FfOL9oK09Cv hLD3C01X5/UGPhgbW5rhqzr3JBZJFdw= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=mKbzCkts; dmarc=none; spf=none (imf25.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673241501; a=rsa-sha256; cv=none; b=rUHHvDmegnLY+RvDh0bMQV/VCGvA3PPO5YkV8aoRFJIYzjZwIZe5y5xQJHd4q4izJOMQuT c4/qy6pLGNxgt1QqIUSKrR/dEuAvsgGW/pNSw6jemDdWM+GAZm7TbzlvaLaJ+QkmsOcsHJ fBJu+dd/zM7ucd6aTt9M5ljcDPL8Lgs= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=lzB774qlWOGeuLTuMSFQPkmJwRXTwSiLN6M5EhwWaoI=; b=mKbzCktscn6Jx0BP1xTRqukdZF nsrtNLVPeVuRjragXpmoIVeIzgGb0cnGyr1MUaySI1GDPtjn0IbSqa1+ySzdBGWA1S+PzmWo59/+f wH9GGe5EvRbCf1EvX6MwIPKGc6bpARRvARTX+OeC+dTWgQAsx9Pq4h2GNzhFWNOFVSkYkGn9pCgRO P8JFQRh+f9PZko0g5ck1IucaLmdMcqlO3ERpHcWUv0XNcctHTopQkPQOZ3QxjGmbwkUSMj0yMwp31 HxN2gKdn3STEHlZiuf/HEmUJitZ5FijtDNFgXX/ve9HDjDPTWu7ilckbmLKnRpQcSsvi0IiYuJ+8Z ViBPmQCQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pEkYE-0020xW-4R; Mon, 09 Jan 2023 05:18:26 +0000 From: "Matthew Wilcox (Oracle)" To: Cc: "Matthew Wilcox (Oracle)" , Jeff Layton , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Christoph Hellwig Subject: [PATCH 10/11] mm: Remove filemap_fdatawait_range_keep_errors() Date: Mon, 9 Jan 2023 05:18:22 +0000 Message-Id: <20230109051823.480289-11-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230109051823.480289-1-willy@infradead.org> References: <20230109051823.480289-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 85200A000A X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: ikjs98jmx3xuemguqnswfmrtez1axu6i X-HE-Tag: 1673241500-719498 X-HE-Meta: U2FsdGVkX1/EgbWLwZtSShBf9+lerr4ab4eurb8SOAD4EFB45Oy4U9pyjdYku6SiihHJX0F4aAsexf36UjDoX5Bcnfp1Rqtv1VlirnLpg9/a9edHQUlzBI2DyCptaU+1OrUP4jCzw3bixD4vYcdtlWxXy8GfWO6N5sHaNITmoKavNKusNPN1StR706TP7w0iXrbebzV/dYZt2BQOMFyTaAqVmdg7NhdUbFRgTvTxT4nIpwl58J//waXxw3gsUXdBJNSivlIxAjz9F9V1QEBmBANboVsMtUPvUOu/+W+t4JReX9gLXSPtvu6CZSfx7R204A8G74JKFWdFQsWeZtxFLIlgSUAmqVlqfef8iuHt7uY1lQTsoeL3nsrS/u3MV6DhBKZ4xNU0vjVsA68ZWPEK5sBacHKiCmdZhj+M8Qj51+XOOtyE9vfq3UoxV3v4wADrslYeF5mbZtM7MkYOHbtc5FHZ5UQsU7coF7lZdu0MZJKTCFn/SDkNg69bVISMO7/aYZo+V8wXXwA2ztb6npQnqtxBEZeO7GMi45X9znSLa8e7xl4cdefE52qxnRUxCnTK75gR60NLFBPoNlvrpsJSAzZWUrnET6YVPf940efb/2eG/9lsBcn/Xgn7qRJTP+SGUfV/uSUswLAs2OQF/puEISVpWU0dhm0z+0lkYkm2itPO6m4+WeqQC+AGlkFYdeq/lvHB+KJAv+NBEA/bILdRTZ6wBhxyL4i8AhUxGZSThKrJJllrpJO2C9Uz6KI2vJz614z6UfakgN9NfU6qlygnasgE2W72Pvhah+juQqkEo//cQg4gUkyV+FoPhlZIyM+gToVf+Kw7MYIbiGvvsCO1GnNO8/e4eH1UocRyYLNEABqwzBn8wJM1hhb5LlTm0VECkwwDFfNZGipAdasj7mjX18IVuCdclSVG/aF7FAUYjeMtbEvWCkB51A== 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: This function is now the same as filemap_fdatawait_range(), so change both callers to use that instead. Signed-off-by: Matthew Wilcox (Oracle) --- fs/jbd2/commit.c | 12 +++++------- include/linux/pagemap.h | 2 -- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 4810438b7856..36aa1b117a50 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -221,11 +221,10 @@ EXPORT_SYMBOL(jbd2_submit_inode_data); int jbd2_wait_inode_data(journal_t *journal, struct jbd2_inode *jinode) { if (!jinode || !(jinode->i_flags & JI_WAIT_DATA) || - !jinode->i_vfs_inode || !jinode->i_vfs_inode->i_mapping) + !jinode->i_vfs_inode || !jinode->i_vfs_inode->i_mapping) return 0; - return filemap_fdatawait_range_keep_errors( - jinode->i_vfs_inode->i_mapping, jinode->i_dirty_start, - jinode->i_dirty_end); + return filemap_fdatawait_range(jinode->i_vfs_inode->i_mapping, + jinode->i_dirty_start, jinode->i_dirty_end); } EXPORT_SYMBOL(jbd2_wait_inode_data); @@ -270,9 +269,8 @@ int jbd2_journal_finish_inode_data_buffers(struct jbd2_inode *jinode) { struct address_space *mapping = jinode->i_vfs_inode->i_mapping; - return filemap_fdatawait_range_keep_errors(mapping, - jinode->i_dirty_start, - jinode->i_dirty_end); + return filemap_fdatawait_range(mapping, jinode->i_dirty_start, + jinode->i_dirty_end); } /* diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 573b8cce3a85..7fe2a5ec1c12 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -40,8 +40,6 @@ static inline int filemap_fdatawait(struct address_space *mapping) return filemap_fdatawait_range(mapping, 0, LLONG_MAX); } -#define filemap_fdatawait_range_keep_errors(mapping, start, end) \ - filemap_fdatawait_range(mapping, start, end) #define filemap_fdatawait_keep_errors(mapping) filemap_fdatawait(mapping) bool filemap_range_has_page(struct address_space *, loff_t lstart, loff_t lend); -- 2.35.1