From 93dfc938f187d702ba5e1202f067dfd224f454ec Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 18 Aug 2022 00:12:38 -0400 Subject: [PATCH] kernel/fs: Print the vnode or mount in question in FS_CALL panics. May help to diagnose #17870. --- src/system/kernel/fs/vfs.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp index c99418093b..dc840a4749 100644 --- a/src/system/kernel/fs/vfs.cpp +++ b/src/system/kernel/fs/vfs.cpp @@ -87,19 +87,19 @@ # define FS_CALL(vnode, op, params...) \ ( HAS_FS_CALL(vnode, op) ? \ vnode->ops->op(vnode->mount->volume, vnode, params) \ - : (panic("FS_CALL op " #op " is NULL"), 0)) + : (panic("FS_CALL: vnode %p op " #op " is NULL", vnode), 0)) # define FS_CALL_NO_PARAMS(vnode, op) \ ( HAS_FS_CALL(vnode, op) ? \ vnode->ops->op(vnode->mount->volume, vnode) \ - : (panic("FS_CALL_NO_PARAMS op " #op " is NULL"), 0)) + : (panic("FS_CALL_NO_PARAMS: vnode %p op " #op " is NULL", vnode), 0)) # define FS_MOUNT_CALL(mount, op, params...) \ ( HAS_FS_MOUNT_CALL(mount, op) ? \ mount->volume->ops->op(mount->volume, params) \ - : (panic("FS_MOUNT_CALL op " #op " is NULL"), 0)) + : (panic("FS_MOUNT_CALL: mount %p op " #op " is NULL", mount), 0)) # define FS_MOUNT_CALL_NO_PARAMS(mount, op) \ ( HAS_FS_MOUNT_CALL(mount, op) ? \ mount->volume->ops->op(mount->volume) \ - : (panic("FS_MOUNT_CALL_NO_PARAMS op " #op " is NULL"), 0)) + : (panic("FS_MOUNT_CALL_NO_PARAMS: mount %p op " #op " is NULL", mount), 0)) #else # define FS_CALL(vnode, op, params...) \ vnode->ops->op(vnode->mount->volume, vnode, params)