From patchwork Mon May 23 01:48:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenXiaoSong X-Patchwork-Id: 12858391 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E91CAC433F5 for ; Mon, 23 May 2022 01:35:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348834AbiEWBfM (ORCPT ); Sun, 22 May 2022 21:35:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233232AbiEWBfL (ORCPT ); Sun, 22 May 2022 21:35:11 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A493238BF6; Sun, 22 May 2022 18:35:10 -0700 (PDT) Received: from kwepemi500025.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4L60H85zpdzjWvg; Mon, 23 May 2022 09:34:12 +0800 (CST) Received: from kwepemm600015.china.huawei.com (7.193.23.52) by kwepemi500025.china.huawei.com (7.221.188.170) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 23 May 2022 09:35:08 +0800 Received: from huawei.com (10.175.127.227) by kwepemm600015.china.huawei.com (7.193.23.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 23 May 2022 09:35:08 +0800 From: ChenXiaoSong To: CC: , , , , , Subject: [PATCH -next,v2] fuse: return the more nuanced writeback error on close() Date: Mon, 23 May 2022 09:48:38 +0800 Message-ID: <20220523014838.1647498-1-chenxiaosong2@huawei.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600015.china.huawei.com (7.193.23.52) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org As filemap_check_errors() only report -EIO or -ENOSPC, we return more nuanced writeback error -(file->f_mapping->wb_err & MAX_ERRNO). filemap_write_and_wait filemap_write_and_wait_range filemap_check_errors -ENOSPC or -EIO filemap_check_wb_err errseq_check return -(file->f_mapping->wb_err & MAX_ERRNO) Signed-off-by: ChenXiaoSong --- fs/fuse/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index f18d14d5fea1..9917bc2795e6 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -488,10 +488,10 @@ static int fuse_flush(struct file *file, fl_owner_t id) inode_unlock(inode); err = filemap_check_errors(file->f_mapping); + /* return more nuanced writeback errors */ if (err) - return err; + return filemap_check_wb_err(file->f_mapping, 0); - err = 0; if (fm->fc->no_flush) goto inval_attr_out;