From patchwork Wed May 23 14:43:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10421661 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 5CE4160327 for ; Wed, 23 May 2018 14:46:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D4522897A for ; Wed, 23 May 2018 14:46:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 41877289B5; Wed, 23 May 2018 14:46:44 +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=unavailable 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 D7F90289B1 for ; Wed, 23 May 2018 14:46:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BD0956B029B; Wed, 23 May 2018 10:45:45 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B58A76B029D; Wed, 23 May 2018 10:45:45 -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 9B1006B029E; Wed, 23 May 2018 10:45:45 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f69.google.com (mail-pl0-f69.google.com [209.85.160.69]) by kanga.kvack.org (Postfix) with ESMTP id 4D3C46B029B for ; Wed, 23 May 2018 10:45:45 -0400 (EDT) Received: by mail-pl0-f69.google.com with SMTP id d9-v6so14381745plj.4 for ; Wed, 23 May 2018 07:45:45 -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=+DiSOJSRMQDFzUjBi5IIcEqppkNyRSQZgXTLy2QP5WY=; b=k7ZfMgl8Tb3r8zpIATCCWV5qzWQz1qQfMF0Lb1YZU1nmkqOsTuoWIkZKGjmihyLTZG znhgF5Z1/gjaDPc292vhs6bMeth1hrWdIsta6Js2wRAbxdc5u1W8xIY3mYlvCe4xMhOF dUMPFCsXNxDhxBdY8FYfIdaH6O9F+YEZQxa6RfCELtq71V7F9yjaBlfvOS+QCHEVeDgJ 1uoARsTuXfw877TevrEc4MPO5PbjhW3eV8KeJiV96hdgr6e/b73Ee2jJClpaKvE8GD6o UNWIgQ3WY9gagLB98Y4XnP7oMUjEBrCI/JOlpDNIivqOa1d3kf+C4MqVVlJJ7O7FH65P 2KrQ== X-Gm-Message-State: ALKqPwcpD0LfbZa8VRalKLWqMI5Hl52m4IKCQM5NYzVh0stC/ZQLRaOc OKPb5E9XkxZIVk48VPIRXxr1rBlrsF/QFfHS9DSHzoSaI8yE9IF/XcST7J5gSNxAT2aFJn7pkuH 9GKkoqRrnScXpGDb9tZjje3lghRvKwN4dosvWwG7hPaT0Jl8yQ55hHfZQXz7mM80= X-Received: by 2002:a63:ac55:: with SMTP id z21-v6mr2543813pgn.73.1527086745004; Wed, 23 May 2018 07:45:45 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrHy9UJ6kqFgzTmax0h/0Li8TkIVvkbBTtW82O+46TyiuTUx/gIyKbVn4XZiz5g3DUmhA5U X-Received: by 2002:a63:ac55:: with SMTP id z21-v6mr2543775pgn.73.1527086744118; Wed, 23 May 2018 07:45:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527086744; cv=none; d=google.com; s=arc-20160816; b=lHWDRt47F8/ApKWXS7+1+2stLQOFJajVEyvcZsOOuGiZqNrI2IFTDmNvxzKPLycjkW Z9JvhDxaLJ4mNhEqkpVNRBkVOl+TDTunu8jDV5FF3nZ2/VHUC6XiJALrRO68TVxG8HL1 raYeqmrzmBwmniBQjnTjlb4LpvJbdyf2b/D0yZYGJdXGfhB6loeSJyGcWbomIEzYxg3M cue5yAQAUeZDS5DoootTznN6UzXLnmuWkRt7X2+0rJcGkhZo5g68UYXpDpg4By/Rhsmj 2qm5OPQcX288YcpKnhb0431afUovw1fLbPpiqulGmctl21vLovlr9lMmpOWbWyYWbRTi CF5w== 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=+DiSOJSRMQDFzUjBi5IIcEqppkNyRSQZgXTLy2QP5WY=; b=aBbBiSaybUIJBTG5ORCYpuodrpiEpRRfSm0Q7o/NzwvYI9flpygFCAaYlzBDgsW50m 0STyKNmYhasxTZnED2qWzvk7jvwy+tOuKhf/6ZL4R565qHzV9C32PgOkwCZBB5mziY9A r1n9BOIWeJ/wZnAxNO42xBNu9e+PUoQQTvag8XnyMNe2NwpHR0OtyRulkNu9WgLU37xu kPpRe0ZrwUzspICO8LSRqtMos61xnQqthSxWfHEPbh0WMbbFEB6G8LcWToIyq1uUlj+v dTLwA17Ge8V2j7+W0Tmytxt1eKN9Z8x8mKeM6zG+P5aqHsRIvmPQv0sLWxHFwD4Y8jsF b7wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=E2nCh7ZO; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+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 d9-v6si14713870pga.192.2018.05.23.07.45.43 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 May 2018 07:45:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+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=E2nCh7ZO; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+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=+DiSOJSRMQDFzUjBi5IIcEqppkNyRSQZgXTLy2QP5WY=; b=E2nCh7ZO9vKD4ow9zRt8vTyzI TXpHDsFviJ2APu+q8Jxw/29qYA9rMrLY6+BAUQc1extDcuPFRYhXHQg2ya4EI7/wpISaFwMelKSkD lyrLevEmrfKIv3Odq+5EVCJq8EjDnYPEtth44gmzCkOlvcSeZtUNvvfiY6D170YooZzQCpTxMvrCG WywZvtrXPaQ5Dcz7SdYbmFzK8hrv2fEYg32xohWYm/QvzbD/4MA33peOv0VTebWRtKO6lmEk50vKG DAEJ7AmpoKvgG7Iek6o40862TnZCr7ORckY5hRdpv+pZv+xXUj4s8Q9cgC7jNwMpBnwazSDm0+/Bg 0MCfomMvQ==; Received: from 089144199016.atnat0008.highway.a1.net ([89.144.199.16] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fLV1I-0002Au-Fq; Wed, 23 May 2018 14:45:41 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 32/34] xfs: refactor the tail of xfs_writepage_map Date: Wed, 23 May 2018 16:43:55 +0200 Message-Id: <20180523144357.18985-33-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523144357.18985-1-hch@lst.de> References: <20180523144357.18985-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 dd92d99df51f..a4e53e0a57c2 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -883,7 +883,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 @@ -892,43 +899,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; }