From nobody Thu May 7 20:50:12 2026 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 DE82AC433EF for ; Wed, 18 May 2022 14:44:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238830AbiEROof (ORCPT ); Wed, 18 May 2022 10:44:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238821AbiEROoX (ORCPT ); Wed, 18 May 2022 10:44:23 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DECE71D500C for ; Wed, 18 May 2022 07:44:21 -0700 (PDT) Received: from kwepemi500006.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4L3G2R5H4nzhZ2S; Wed, 18 May 2022 22:43:43 +0800 (CST) Received: from kwepemm600015.china.huawei.com (7.193.23.52) by kwepemi500006.china.huawei.com (7.221.188.68) 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:44:19 +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:44:18 +0800 From: ChenXiaoSong To: CC: , , , , , Subject: [PATCH -next] orangefs: return the more nuanced writeback error on close() Date: Wed, 18 May 2022 22:57:59 +0800 Message-ID: <20220518145759.2488632-1-chenxiaosong2@huawei.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As filemap_check_errors() only report -EIO or -ENOSPC, we return more nuanc= ed 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/orangefs/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c index 86810e5d7914..5c9f0ad7e317 100644 --- a/fs/orangefs/file.c +++ b/fs/orangefs/file.c @@ -545,10 +545,10 @@ static int orangefs_flush(struct file *file, fl_owner= _t id) int r; =20 r =3D filemap_write_and_wait_range(file->f_mapping, 0, LLONG_MAX); - if (r > 0) - return 0; - else - return r; + /* get more nuanced writeback errors */ + if (r) + r =3D filemap_check_wb_err(file->f_mapping, 0); + return r; } =20 /** ORANGEFS implementation of VFS file operations */ --=20 2.31.1