From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00EAB54DACC for ; Tue, 8 Sep 2026 14:54:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788879282; cv=none; b=XCq0p0K03764bXJ6+xkyl6GXNJVfa2JF3PlFrpyU5falUx6uiC+1tcMu9Y4vGCSWeu/tN75b84Vp9iMusMhFd5nq/N0tER6wB+2JWqDxoD22PGCP1onVCr9vWscEw1ibBL4JBtQK1kCkzPxonaqtLd99uqfh5I86X5kTQqpZ+CI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788879282; c=relaxed/simple; bh=b90GYxPuVT+k1aOkIZdfyIKrgmQCvXYlDQpUHb8o+gU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lxMAYjBR8KpJkVADj4uskDl41CmiQlGse4PaRJ89MLdFQ2i1WWTrZRUPUXVDXmuyUeG8r5txX0DaD5IqelmORWQVJwl/mprhJrUcaHq5q5zJ/h49bVJ9Zcnn28wyspM/aTFXS7Gxr6jYQh0LeK4GUvaxZbe4+Sygs5/4WNHu3yA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UkKPOibi; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UkKPOibi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64ABC1F00A3F; Tue, 8 Sep 2026 14:54:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788879271; bh=P9o7PQjVYwBK14sibCxCqMuKcf0O3LuRb+eJI/OWOQ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UkKPOibizBWiwgruNtepCXrBDk/BzkkROh65z0yTh3jlllivM1MFdZf4yDfm0igQn MENK0XVCSMpAvW2ECAI6cxBHha98xBz52iLPtsRmLhQmVxzJG7w7zDnqdn7V4FXjdA GYWHs8aD7pnqiEoi/31Uw+qp4xpej/Hi34U7mS8MC3YM9a06u+Ee0m+VchNl1xDnh1 PdomiEO0udWlvTkxDxg3Km7spED5sx/8JVMCrmJvVrmCXdeR5K/S9t+H7yAKUMB2xs 71YYMrpFMlP6wVkIyxf07L2+ammjLmZIL6FSPVemJniEko5S/fJv0sHLp+Tntt7wcZ /QIMFTk+bje/g== From: cem@kernel.org To: cem@kernel.org Cc: hch@lst.de, djwong@kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 1/3] xfs: add xfs_error_report the ability to display an error code Date: Tue, 8 Sep 2026 16:54:14 +0200 Message-ID: <20260908145422.232985-2-cem@kernel.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260908145422.232985-1-cem@kernel.org> References: <20260908145422.232985-1-cem@kernel.org> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Carlos Maiolino Users could opt to request an error code to be printed now. This relies on errname() and CONFIG_SYMBOLIC_NAME without requiring it to be enabled. Report 'unkown error' If CONFIG_SYMBOLIC_NAME is not enabled or the user passes 0 as an error. Signed-off-by: Carlos Maiolino --- fs/xfs/xfs_error.c | 13 ++++++++++--- fs/xfs/xfs_error.h | 10 +++++----- fs/xfs/xfs_exchmaps_item.c | 9 ++++++--- fs/xfs/xfs_inode_item.c | 3 ++- fs/xfs/xfs_log_recover.c | 3 ++- fs/xfs/xfs_trans.c | 2 +- 6 files changed, 26 insertions(+), 14 deletions(-) diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c index dbd87e137694..3177ec58bb2e 100644 --- a/fs/xfs/xfs_error.c +++ b/fs/xfs/xfs_error.c @@ -14,6 +14,7 @@ #include "xfs_error.h" #include "xfs_sysfs.h" #include "xfs_inode.h" +#include #ifdef DEBUG @@ -377,15 +378,21 @@ void xfs_error_report( const char *tag, int level, + int error, struct xfs_mount *mp, const char *filename, int linenum, xfs_failaddr_t failaddr) { + const char *err_str = errname(error); + + if (!err_str) + err_str = "unknown error"; + if (level <= xfs_error_level) { xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT, - "Internal error %s at line %d of file %s. Caller %pS", - tag, linenum, filename, failaddr); + "Internal error %s (%s) at line %d of file %s. Caller %pS", + tag, err_str, linenum, filename, failaddr); xfs_stack_trace(); } @@ -404,7 +411,7 @@ xfs_corruption_error( { if (buf && level <= xfs_error_level) xfs_hex_dump(buf, bufsize); - xfs_error_report(tag, level, mp, filename, linenum, failaddr); + xfs_error_report(tag, level, 0, mp, filename, linenum, failaddr); xfs_alert(mp, "Corruption detected. Unmount and run xfs_repair"); } diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h index 0b9c5ba8a598..f3b5564c2f4f 100644 --- a/fs/xfs/xfs_error.h +++ b/fs/xfs/xfs_error.h @@ -8,9 +8,9 @@ struct xfs_mount; -extern void xfs_error_report(const char *tag, int level, struct xfs_mount *mp, - const char *filename, int linenum, - xfs_failaddr_t failaddr); +void xfs_error_report(const char *tag, int level, int error, + struct xfs_mount *mp, const char *filename, + int linenum, xfs_failaddr_t failaddr); extern void xfs_corruption_error(const char *tag, int level, struct xfs_mount *mp, const void *buf, size_t bufsize, const char *filename, int linenum, @@ -25,8 +25,8 @@ extern void xfs_inode_verifier_error(struct xfs_inode *ip, int error, const char *name, const void *buf, size_t bufsz, xfs_failaddr_t failaddr); -#define XFS_ERROR_REPORT(e, lvl, mp) \ - xfs_error_report(e, lvl, mp, __FILE__, __LINE__, __return_address) +#define XFS_ERROR_REPORT(e, lvl, error, mp) \ + xfs_error_report(e, lvl, error, mp, __FILE__, __LINE__, __return_address) #define XFS_CORRUPTION_ERROR(e, lvl, mp, buf, bufsize) \ xfs_corruption_error(e, lvl, mp, buf, bufsize, \ __FILE__, __LINE__, __return_address) diff --git a/fs/xfs/xfs_exchmaps_item.c b/fs/xfs/xfs_exchmaps_item.c index 264a121c5e16..2cbc1b9aee43 100644 --- a/fs/xfs/xfs_exchmaps_item.c +++ b/fs/xfs/xfs_exchmaps_item.c @@ -559,13 +559,15 @@ xlog_recover_xmi_commit_pass2( len = sizeof(struct xfs_xmi_log_format); if (item->ri_buf[0].i_len != len) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, log->l_mp); + XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, + -EFSCORRUPTED, log->l_mp); return -EFSCORRUPTED; } xmi_formatp = item->ri_buf[0].i_addr; if (xmi_formatp->__pad != 0) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, log->l_mp); + XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, + -EFSCORRUPTED, log->l_mp); return -EFSCORRUPTED; } @@ -600,7 +602,8 @@ xlog_recover_xmd_commit_pass2( xmd_formatp = item->ri_buf[0].i_addr; if (item->ri_buf[0].i_len != sizeof(struct xfs_xmd_log_format)) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, log->l_mp); + XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, + -EFSCORRUPTED, log->l_mp); return -EFSCORRUPTED; } diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c index c6cb0b6b9e46..c361e02110a0 100644 --- a/fs/xfs/xfs_inode_item.c +++ b/fs/xfs/xfs_inode_item.c @@ -1185,7 +1185,8 @@ xfs_inode_item_format_convert( struct xfs_inode_log_format_32 *in_f32 = buf->i_addr; if (buf->i_len != sizeof(*in_f32)) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, NULL); + XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, + -EFSCORRUPTED, NULL); return -EFSCORRUPTED; } diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 2f76531842f8..b1979d00d2e3 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -2932,7 +2932,8 @@ xlog_recover_process( * fatal log corruption failure. */ if (xfs_has_crc(log->l_mp)) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, log->l_mp); + XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, + -EFSCORRUPTED, log->l_mp); return -EFSCORRUPTED; } } diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index c6657072361a..792a67a7ec28 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c @@ -999,7 +999,7 @@ xfs_trans_cancel( * here. */ if (dirty && !xfs_is_shutdown(mp)) { - XFS_ERROR_REPORT("xfs_trans_cancel", XFS_ERRLEVEL_LOW, mp); + XFS_ERROR_REPORT("xfs_trans_cancel", XFS_ERRLEVEL_LOW, 0, mp); xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE); } #ifdef DEBUG -- 2.55.0