From patchwork Mon Jan 9 05:18:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthew Wilcox (Oracle)" X-Patchwork-Id: 13093056 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 D8162C5479D for ; Mon, 9 Jan 2023 05:18:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA9BF8E000A; Mon, 9 Jan 2023 00:18:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C08728E0003; 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 A0C218E0009; Mon, 9 Jan 2023 00:18:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 794EC8E000A for ; Mon, 9 Jan 2023 00:18:23 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 58D561C5B3B for ; Mon, 9 Jan 2023 05:18:23 +0000 (UTC) X-FDA: 80334104886.05.E9AC719 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf08.hostedemail.com (Postfix) with ESMTP id A1B02160008 for ; Mon, 9 Jan 2023 05:18:20 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ROGJTN6U; dmarc=none; spf=none (imf08.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=b0czJbVeNEC59VHM8B9sq3qAwimTZQLD9J+IkbH6tGY=; b=Zk1mogk4iMChnfZxFJwWtwUAOO1tMJ4gvOQk91i6U0hCqm5EG5NaMPxixja9Z8k9LWU8m+ 2b76ke0BbTc/nHcpDnkSID/KW7BqrVyibmoEypnG+6JDztY/DFFdyBukG6TLifgFf8IUbl 6Di/1sOj1gsQ3tyX6qPORytqDWtsHdQ= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ROGJTN6U; dmarc=none; spf=none (imf08.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=rqLfjZos15HDS49znaB4+n9M8fZMU0XAHtrleRm90OfoKgcWdh5FQax9B1Nj1F9y2avoKG ZzgLC6L/h7TsE740BlANgkXNQfXEb0l78UGhZT7qampeLuAlvTcxAzakB8vmqnF397kxzh Lq+DWiqa8JptfwXoL4Zh1YV8Q/tzZPs= 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=b0czJbVeNEC59VHM8B9sq3qAwimTZQLD9J+IkbH6tGY=; b=ROGJTN6UntJy+YzsThEJJrxCJi TtVnoQq6up+P0EtHyGjHt6GeNnEoNZZk5bvjdgDBnt5U65teg3i0Q/vxeBhKrad0sQs5iCaUJ9aai hCoVJCKYxDMlWwNLtSUIdhPNwVYFZp7rjLsp1+yMFDTlOZEtR/uM5wKsrSTfHHqwDseBTLtSg1DqX 9fj9xRKQeflkeQLrCnDNMoea62skAbanZyCf2l5+xZAyzuXC4pRHywBj+sm5Z1MGsJ/DbzLeUgH2w RCVS9uE/Mi1NxFEeqnCNUT4mhbmgSj9IAKRM104Ix+jlmWWqNram/pb4oU6K2cN5Lppll1ajraNhZ 0ddXvYzQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pEkYD-0020x5-JH; Mon, 09 Jan 2023 05:18:25 +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 06/11] filemap: Convert filemap_write_and_wait_range() to use errseq Date: Mon, 9 Jan 2023 05:18:18 +0000 Message-Id: <20230109051823.480289-7-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 X-Rspamd-Queue-Id: A1B02160008 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: e9fwn1jmjfraakdbmkoyoqkx5pr8ooan X-HE-Tag: 1673241500-994624 X-HE-Meta: U2FsdGVkX1+gInmr2qWkU1NeLkALVgRWtC2oC87YjL1h5V1xWmFT22YQl0LTIKwBSl8sAiv+vahZzbZsLG/Npjq/8PLHRCZHHLz8y4eMAX5oQ84eSp6VVLaZbnUeVY/9d5LVDlQ5t9LVOqAqOYQEsqdlsrelEJa8scJhHv4S6hnS2fMzPdxYIY58JXSqUevu6B+OludEh+woQ796BXPu3eOaE/5Hf67ebcSConacY8yG+WUuSPKa3owllEV7ahQaCuSeQfzF3GgHwYB+8CCUVBDEoHdWmRu1WSoYBUIgTW8TrfO0bDAkr7ReI2F0p0pLsLlegSITij1Fdid1mxJJKo7zX/i/yhM3J+YhMrb4jqXleQV3Ylr5u30s6NM5n0pObNHU544m79y4AIF/f2236tyYL+o2f/nWcEBefIUrPKIOtwWWp4TiYl1FemxpTPRn6l5oVCYYOEiDYKs/WIP2KLXahfoXTRI0HuAw/oc457vrYoJSvvPjwJ5Ne6YOdcCFyye007a8JLSqUJSulgIv4ZCx7aK7es7vD6FMBM2KAUXPrtjYspD+9TtbSQo39eer2Pfnria31hOgLbf7xHkPfRtmP31L8rBiehcdqy0qIkR+2CM+H4+mmE1cg8OrCXWX3UNKfiP8bRmAPFNM6Eod+N7fMy4vum6M3sC3vdHOW0O/xOHla0g15b6AYz8rmuSi62Z3Vr4zJDka+4y6jFxTnonoeSUmRS28Nu1bKcEQQR/wrqiUazrui+85ZUhqPYI6qIEPqZz68YFuz95Xkk5frD6qZV0rmc4PWCLhhy0zI1HyM8sREQPT3GcM/3Tg5GyuQSoZzLe8EbtJnVmHIe9qpQMA4Mewvz7IxFfs5KY7J2l9MFt2AlYm2PuuEcogW2OTR2f4L4xVoE11Aas5aBYdhOXRvFcqJhjatGmMUMs6JSM29LqJERQeZg== 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 the errseq APIs to discover writeback errors instead of filemap_check_errors(). This gives us more precise information about whether this writeback generated the error. This will no longer clear errors, so they will be visible to other users, which is what we want. Take this opportunity to de-indent filemap_write_and_wait_range(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 48daedc224d9..c72b2e1140d7 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -659,26 +659,27 @@ EXPORT_SYMBOL_GPL(filemap_range_has_writeback); int filemap_write_and_wait_range(struct address_space *mapping, loff_t lstart, loff_t lend) { - int err = 0, err2; + int err; + errseq_t since; if (lend < lstart) return 0; + if (!mapping_needs_writeback(mapping)) + return 0; - if (mapping_needs_writeback(mapping)) { - err = __filemap_fdatawrite_range(mapping, lstart, lend, - WB_SYNC_ALL); - /* - * Even if the above returned error, the pages may be - * written partially (e.g. -ENOSPC), so we wait for it. - * But the -EIO is special case, it may indicate the worst - * thing (e.g. bug) happened, so we avoid waiting for it. - */ - if (err != -EIO) - __filemap_fdatawait_range(mapping, lstart, lend); - } - err2 = filemap_check_errors(mapping); + since = filemap_sample_wb_err(mapping); + err = __filemap_fdatawrite_range(mapping, lstart, lend, WB_SYNC_ALL); + /* + * Even if the above returned an error, the pages may be written + * partially (e.g. -ENOSPC), so we wait for it. But the -EIO + * is a special case, it may indicate the worst thing (e.g. bug) + * happened, so we avoid waiting for it. + */ + if (err != -EIO) + __filemap_fdatawait_range(mapping, lstart, lend); if (!err) - err = err2; + err = filemap_check_wb_err(mapping, since); + return err; } EXPORT_SYMBOL(filemap_write_and_wait_range);