From patchwork Wed May 9 07:48:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10388499 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5131360170 for ; Wed, 9 May 2018 07:50:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40CCF28E56 for ; Wed, 9 May 2018 07:50:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3301F28E6C; Wed, 9 May 2018 07:50:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 183FC28E56 for ; Wed, 9 May 2018 07:50:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 19AA86B0375; Wed, 9 May 2018 03:50:28 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1235D6B0378; Wed, 9 May 2018 03:50:28 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EC1A66B0375; Wed, 9 May 2018 03:50:27 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f69.google.com (mail-pg0-f69.google.com [74.125.83.69]) by kanga.kvack.org (Postfix) with ESMTP id A41C26B0375 for ; Wed, 9 May 2018 03:50:27 -0400 (EDT) Received: by mail-pg0-f69.google.com with SMTP id x205-v6so19424655pgx.19 for ; Wed, 09 May 2018 00:50:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=RnQ40Y8icT7VZNAQr7jMxJV0RGyk1YQlG1KrGvV7Kvc=; b=jj6tU6yjqM713UwT0o+v5Xj6VBX4HkikVV3WRfCCpFf8WfIeW1exKM4lJMD8FvClbV /A20+P3WZ15zTQ79oG6L/LIOMFqEeGhGkmBENzrEJvzSrkbQR/wIBddLUpVU5xKrwA3H YJB5IDJSiFT1obUvrFhhC9ZzrWR/kcLUw3ZoPszUK+mWKsSbGwrxg/+xJQPwtYDqHgrt WR7akIlpVqvYNtCiFIdXkneWepy2AJdsX1tI7Juz/65aoAA93v+g9FN3sY1Ka8fTjyLO cjS3ywitU9wRLjH9XoxD1BIu8slRs5sTHJ4V5wrstTPDRopvwics7zf7UIM4ATDEQKuS fQvQ== X-Gm-Message-State: ALQs6tA0gWJn3NLRTPUJ4TP2AReTsCyetRUGs+wZA83lnmsk1Lj6Ob95 EHg806ksPMcxPV0xzm5Y8ZM1XdYKB7nUIEUcM7SVZS5K+bGZ7MeLSlFn32yjBDj6ECd9ukDnxC4 lJNpSB3yKeJkpIf2Ei5FA7kLXfirZcAeXUfhackExIpUf00/tU7Qbqo2i/2g4Gl4= X-Received: by 2002:a65:6215:: with SMTP id d21-v6mr11940123pgv.170.1525852227357; Wed, 09 May 2018 00:50:27 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrbE5RURrqhdAPdhvY9ngEpj+DNMTsqaf5fTdL16fTdu853VFt84NO1NG252XZpl359GET9 X-Received: by 2002:a65:6215:: with SMTP id d21-v6mr11940096pgv.170.1525852226545; Wed, 09 May 2018 00:50:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525852226; cv=none; d=google.com; s=arc-20160816; b=H3ELsHes0aktk15TgI+G8ixPaKOXswaTQbB2LuAOpvW815twTfKWyTDmm7GQBSjdMA 04Cip9ra5jz6NIAzMGYVeq/mMsuhB/3KghuT9TewVTjKkEh0iI6FRY28FDN1N5GOhVGH xuNAgl41F6nd2xw0u/7YwDbWn8jwBVI/CO4f59p41Avpg10kxVab6qK+Pd4PylGmHTyY d1zYDKLSaIoUibv5zMglt0q9Nf0UDLejhXyKyC77Jh1jPBvgp5Rgs9HAekX34Mhze6BF pgjGM7dn4R8N2tucflREKGJACKPm8/vaUgiSYF2Lvm+n4hADcx/rbz4K6agwj2YdoFLN n2Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=RnQ40Y8icT7VZNAQr7jMxJV0RGyk1YQlG1KrGvV7Kvc=; b=EiQD+wVXlxTdUE9gaFjDE7JKIxFbvwOlJCBxN6clOzsuv1aZZsOydtUXO4s2n3xXkk tlqr/YSrFGbYdwn33pByeTbq+/Y6xoyFqszvnXd6zBKs7xSevoajyLaR0BZmSOqqPVg2 a6bxHcvCl0ibAolvCm2DQvXz7SKgJdxCuz5xG55lxtYpP3We4yXOIq53CGITUVQsxQ5f Cs66ORrmvOZ+DVo6CW6tSVI4zXrskqeRb73+KnihWMNp5A2kVR2lUfS6bCVLje9hIGK0 h1Aa3VQHJ+9xjxN9ujM1yKMIjPbs18AxC6ckmk9369p41QWFIoZUpzfaDNMmkgCYOBK4 +rUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=Hl81kAcg; spf=pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id c20-v6si17978302pls.557.2018.05.09.00.50.26 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 May 2018 00:50:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=Hl81kAcg; spf=pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=RnQ40Y8icT7VZNAQr7jMxJV0RGyk1YQlG1KrGvV7Kvc=; b=Hl81kAcgP1eBT2eLvyFHuDeXG dPs27OsNiItw5YcFsZDdejekmPvhbDISZrh+RvA0ez4seEDGkhnaArIxFBrvLaGjpaijKhD21VDde /E92y7h1143qt4GUN1X3UNHN3+ygn4Z//ESsho66m2fOvtyr+XjN4YTmpX/MW/6jh7YKlycLHalKk rMkT98+3rfzZUPQJZFJdgAWkUi2WOlMlalncNeTeMtrEcJKLGZuaBZDA9V70nJiEjHUZcwCsq+l5R kGWaPCcjyfUaNsBrVkdxcv8GQ233nW/0l2/YWHKld9MrGlicgHF6H5aho1gn8BpYLtsNsUbYPfC5G ocsEexi6A==; Received: from 213-225-15-246.nat.highway.a1.net ([213.225.15.246] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fGJri-0002g8-K4; Wed, 09 May 2018 07:50:23 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 28/33] xfs: refactor the tail of xfs_writepage_map Date: Wed, 9 May 2018 09:48:25 +0200 Message-Id: <20180509074830.16196-29-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509074830.16196-1-hch@lst.de> References: <20180509074830.16196-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html 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: X-Virus-Scanned: ClamAV using ClamSMTP Rejuggle how we deal with the different error vs non-error and have ioends vs not have ioend cases to keep the fast path streamlined, and the duplicate code at a minimum. Signed-off-by: Christoph Hellwig --- fs/xfs/xfs_aops.c | 65 +++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 6b39792270aa..dc82d4e71a64 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -906,7 +906,14 @@ xfs_writepage_map( * submission of outstanding ioends on the writepage context so they are * treated correctly on error. */ - if (count) { + if (unlikely(error)) { + if (!count) { + xfs_aops_discard_page(page); + ClearPageUptodate(page); + unlock_page(page); + goto done; + } + /* * If the page was not fully cleaned, we need to ensure that the * higher layers come back to it correctly. That means we need @@ -915,43 +922,35 @@ xfs_writepage_map( * so another attempt to write this page in this writeback sweep * will be made. */ - if (error) { - set_page_writeback_keepwrite(page); - } else { - clear_page_dirty_for_io(page); - set_page_writeback(page); - } - unlock_page(page); - - /* - * Preserve the original error if there was one, otherwise catch - * submission errors here and propagate into subsequent ioend - * submissions. - */ - list_for_each_entry_safe(ioend, next, &submit_list, io_list) { - int error2; - - list_del_init(&ioend->io_list); - error2 = xfs_submit_ioend(wbc, ioend, error); - if (error2 && !error) - error = error2; - } - } else if (error) { - xfs_aops_discard_page(page); - ClearPageUptodate(page); - unlock_page(page); + set_page_writeback_keepwrite(page); } else { - /* - * We can end up here with no error and nothing to write if we - * race with a partial page truncate on a sub-page block sized - * filesystem. In that case we need to mark the page clean. - */ clear_page_dirty_for_io(page); set_page_writeback(page); - unlock_page(page); - end_page_writeback(page); } + unlock_page(page); + + /* + * Preserve the original error if there was one, otherwise catch + * submission errors here and propagate into subsequent ioend + * submissions. + */ + list_for_each_entry_safe(ioend, next, &submit_list, io_list) { + int error2; + + list_del_init(&ioend->io_list); + error2 = xfs_submit_ioend(wbc, ioend, error); + if (error2 && !error) + error = error2; + } + + /* + * We can end up here with no error and nothing to write if we race with + * a partial page truncate on a sub-page block sized filesystem. + */ + if (!count) + end_page_writeback(page); +done: mapping_set_error(page->mapping, error); return error; }