The branch main has been updated by des:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ccc7f2f20238675cda9cf704bd2ca49f2979ed0d
commit ccc7f2f20238675cda9cf704bd2ca49f2979ed0d
Author: Dag-Erling Smørgrav <d...@freebsd.org>
AuthorDate: 2025-08-17 17:08:45 +0000
Commit: Dag-Erling Smørgrav <d...@freebsd.org>
CommitDate: 2025-08-17 17:29:27 +0000
zfs: Set st_rdev to NODEV, not 0, when not a device
Reviewed by: kib
Differential Revision: https://reviews.freebsd.org/D51954
---
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 2 +-
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c
b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c
index 61d0bb26d1e5..3377db7952ef 100644
--- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c
@@ -494,7 +494,7 @@ zfsctl_common_getattr(vnode_t *vp, vattr_t *vap)
vap->va_uid = 0;
vap->va_gid = 0;
- vap->va_rdev = 0;
+ vap->va_rdev = NODEV;
/*
* We are a purely virtual object, so we have no
* blocksize or allocated blocks.
diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
index 1813c411b013..64995f14ee5f 100644
--- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
@@ -2013,7 +2013,7 @@ zfs_getattr(vnode_t *vp, vattr_t *vap, int flags, cred_t
*cr)
if (vp->v_type == VBLK || vp->v_type == VCHR)
vap->va_rdev = zfs_cmpldev(rdev);
else
- vap->va_rdev = 0;
+ vap->va_rdev = NODEV;
vap->va_gen = zp->z_gen;
vap->va_flags = 0; /* FreeBSD: Reset chflags(2) flags. */
vap->va_filerev = zp->z_seq;
