From patchwork Fri May 18 12:34:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 10410387 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 5F710602CB for ; Fri, 18 May 2018 12:36:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50F5F28936 for ; Fri, 18 May 2018 12:36:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 437B028956; Fri, 18 May 2018 12:36:49 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D537328952 for ; Fri, 18 May 2018 12:36:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752343AbeERMfq (ORCPT ); Fri, 18 May 2018 08:35:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:39560 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751999AbeERMe0 (ORCPT ); Fri, 18 May 2018 08:34:26 -0400 Received: from tleilax.poochiereds.net (cpe-71-70-156-158.nc.res.rr.com [71.70.156.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B7EF420862; Fri, 18 May 2018 12:34:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1526646865; bh=U5P6t942xL0ZjZwriGkEdaoJnyEE3CRi7h8SXSkDJMM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l9ifthQBDmmj5Mjh6Rq0abzM13TPWQqSoMczfGxopcfR3lRbrZWfOTNkDSGBXPBrM D01PHUz4p/SyZ3SAdm0NJQQvnTUXrkRExNafoRsegOAQKdgrpTsuzcAWDcyvp4ODoU hXLNfbN0opj/+gD0aagee+B5lg+/YXwsTMwkZ3H4= From: Jeff Layton To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: viro@ZenIV.linux.org.uk, willy@infradead.org, andres@anarazel.de Subject: [RFC PATCH 09/11] btrfs: have sync_fs op report writeback errors when passed a since pointer Date: Fri, 18 May 2018 08:34:13 -0400 Message-Id: <20180518123415.28181-10-jlayton@kernel.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518123415.28181-1-jlayton@kernel.org> References: <20180518123415.28181-1-jlayton@kernel.org> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jeff Layton Signed-off-by: Jeff Layton --- fs/btrfs/super.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 4b3e6676be9d..eac785459f10 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1231,12 +1231,13 @@ int btrfs_sync_fs(struct super_block *sb, int wait, errseq_t *since) struct btrfs_trans_handle *trans; struct btrfs_fs_info *fs_info = btrfs_sb(sb); struct btrfs_root *root = fs_info->tree_root; + int ret = 0; trace_btrfs_sync_fs(fs_info, wait); if (!wait) { filemap_flush(fs_info->btree_inode->i_mapping); - return 0; + goto out; } btrfs_wait_ordered_roots(fs_info, U64_MAX, 0, (u64)-1); @@ -1250,7 +1251,7 @@ int btrfs_sync_fs(struct super_block *sb, int wait, errseq_t *since) * that need to go through commit */ if (fs_info->pending_changes == 0) - return 0; + goto out; /* * A non-blocking test if the fs is frozen. We must not * start a new transaction here otherwise a deadlock @@ -1260,13 +1261,22 @@ int btrfs_sync_fs(struct super_block *sb, int wait, errseq_t *since) if (sb_start_write_trylock(sb)) sb_end_write(sb); else - return 0; + goto out; trans = btrfs_start_transaction(root, 0); } - if (IS_ERR(trans)) - return PTR_ERR(trans); + if (IS_ERR(trans)) { + ret = PTR_ERR(trans); + goto out; + } } - return btrfs_commit_transaction(trans); + ret = btrfs_commit_transaction(trans); +out: + if (since) { + int ret2 = errseq_check_and_advance(&sb->s_wb_err, since); + if (ret == 0) + ret = ret2; + } + return ret; } static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)