Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp544370iob; Wed, 18 May 2022 07:44:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/dOFWO7ot92gkVBVi3/STZK0B3DQ2Sc2HVBhDgf5rzcWmVpKErpCVli6o4hziGCdDPVpD X-Received: by 2002:a17:90a:17a9:b0:1df:4826:5155 with SMTP id q38-20020a17090a17a900b001df48265155mr317981pja.201.1652885060876; Wed, 18 May 2022 07:44:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652885060; cv=none; d=google.com; s=arc-20160816; b=HrxPY9A38judkOAK1RcmAjlYf5rgszPwwcXUNfAksm9M1al47jD5yJaIsTeLXD55SA ky1C3nNonh6VlMuP4RrxjKilJHpElyU6rGuySPkzhjH9Snnht55iV9SyBuZNMKXGT6+R dHNss2kaYEv+X6PpWDCamStH837oU4im2mJpFaQhuFkcOEIEiT+OG6q+2flZzfdxcVv9 dz05sDobW2m93G9jpXmlU27TNLhYz6bA/P2tLrhTiTubM1pmm+AL/WiCc5ex1rtbEMiJ 9ybuh78enYXGjOvjo/o0ik3nZQI1xEHcXQUFCri+KipzUy8O0qEJEurmO6LHBcYVJKkn Hbxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=q7VFZ4ugmpyUa8hIMvVPkQh4HrLlsSZjBQ2wKpQ/FGs=; b=nDoajsrFClPnAWrzKlXv9rQ/yXhVIQpZEtSaYEoBSaceAtc8dzdrHjynprBc0nx1oD y+kEq+e9ERVS2SjUKBSbkVSWowVKMYbfHa47z8nmdadBGGhf6ABkixoZxJoXNsNSAO40 xkAkleinfYNLeUVp4cCr08zYGEoy+623k4LLZjJrPS60ZBcsx1S448lE+kXuNyez/ITt pLxfVa4tDsPX0/Osp0QdCcWAlQrxG0k9Z8rWBdi4KcspaGoARaMi7CGmwEJ/XJxHevMe 3iX/3t74NUS1Z58cggueBjCMGso+8g95NvZ8hkcVOfVGBImvDvziEoGrkSpCtt+cj7RK Z8pw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id u21-20020a17090ae01500b001d4e0d81848si6473121pjy.152.2022.05.18.07.44.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 07:44:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 87FB91D5017; Wed, 18 May 2022 07:44:05 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238813AbiEROn4 (ORCPT + 99 others); Wed, 18 May 2022 10:43:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238755AbiEROnw (ORCPT ); Wed, 18 May 2022 10:43:52 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1388C18AAA7; Wed, 18 May 2022 07:43:51 -0700 (PDT) Received: from kwepemi500007.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4L3FzB1sntzQkCL; Wed, 18 May 2022 22:40:54 +0800 (CST) Received: from kwepemm600015.china.huawei.com (7.193.23.52) by kwepemi500007.china.huawei.com (7.221.188.207) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 18 May 2022 22:43:48 +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; Wed, 18 May 2022 22:43:48 +0800 From: ChenXiaoSong To: CC: , , , , , Subject: [PATCH -next] fuse: return the more nuanced writeback error on close() Date: Wed, 18 May 2022 22:57:29 +0800 Message-ID: <20220518145729.2488102-1-chenxiaosong2@huawei.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemm600015.china.huawei.com (7.193.23.52) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index f18d14d5fea1..4a0add7f0a17 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -488,8 +488,9 @@ 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) -- 2.31.1