From nobody Sun Aug 24 00:27:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c8ZWD3jX7z64hpZ; Sun, 24 Aug 2025 00:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8ZWD32TKz3CGM; Sun, 24 Aug 2025 00:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755995240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xramz2JLZDlw4DbhA5af/cxpraWi0aeQOJxh64MTbv8=; b=rlNqCPIv9cpQWFQosf8XoUGoZQGQqW4a0A18XFFRdN1lFBjTCB8lvQx3nX+bCRcWwKj8tJ VnwX/Zgc7wEHnz5VxteaLEQWaStSkEJkpwJ3NNEWD9Iuv+agtfWH6XnkN/gjSXaD4NdSgp MPRKBR8HDnYCXdYJ8I5DFdFm3sglVDLo+YbG/iNoZ1lbQemgWr8g3JyIy8nbnd3XPIdE7y KwGVcfDZBijhb/EwMv+pLOD/FjuRreb/mc6c7n3QqZ7spIuDduWJknS7E/msvEO4F65Qcy hsSORgF/FaceuVfJa1pM5Y0FkHYODQOFJerd0D98xjzv5Lsly7mY51Rjr3+izg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755995240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xramz2JLZDlw4DbhA5af/cxpraWi0aeQOJxh64MTbv8=; b=FMyICyEOE3/4tMQ9V17osS12XvPe9TRMyuqT6JH80oyP9Uzl9804D3Fxs6MNcUS5YX87TW d6W0yr4KsVwwcwXAxXzGJgMu9bbVCETRyo97aDAWwaPCa8o11JF3xp/4DjPTIEbU+I/0kw 8ax/7YMzRiaOA2G4oxbmDfpWJBcsoMVKzAEc9HROVRTLnwLuIj4/m1jXBofEWGMQosEu1k GBO7LWEa/qL/wbH9iwFZlN97Rqey1pi2s3UmoqlTyLoTN+GMQaXdID79NW0TeSity2tTq9 KlNzvBJjlB/mjtFxwLQLiK3Z7LH0RkdTbHmPbOsQyYGSua0xvZ+e80qcH3ga8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755995240; a=rsa-sha256; cv=none; b=cTJcVyf6qMYoRdhq0OUJy+r7EjxfOl+1Myhce6FTKkcpP2bILJcgtGFvbnOzx6bjA+4GoK D9OnIfobrm4DGgKDT8mkptk7qqU4Nv1+M2qYADskuKBDGxOZGjmIRPwQJA+Qjmpd+hTADq wOhQtllOL0nPuJINSIi87bF4RZ/IeO2LqRVQdYjFyZHffmFFUNOpu+2W7viE+cpWTBjEYq N/WtdsaqZBxP9VqnTupVQR5dKiI6c/qCp7I28J/bo8scN/edIvEtsFP78f2963Bfv174dF g0b/hYFUz0rQos/+oKy2NpfwEzqBJcSfhGoavP5kEYEtWbM+HzKUIBhRcSgRTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c8ZWD29DNzg1P; Sun, 24 Aug 2025 00:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57O0RKLk038172; Sun, 24 Aug 2025 00:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57O0RKv4038169; Sun, 24 Aug 2025 00:27:20 GMT (envelope-from git) Date: Sun, 24 Aug 2025 00:27:20 GMT Message-Id: <202508240027.57O0RKv4038169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0c3d511959ba - stable/14 - ufs: st_rdev is only meaningful for special nodes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0c3d511959bac1661cb3891042e380bc480d8266 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0c3d511959bac1661cb3891042e380bc480d8266 commit 0c3d511959bac1661cb3891042e380bc480d8266 Author: Konstantin Belousov AuthorDate: 2025-08-17 13:03:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-24 00:26:56 +0000 ufs: st_rdev is only meaningful for special nodes (cherry picked from commit 6fd60c4887cb08203f654e6aac6b4dbaaf76111b) --- sys/ufs/ufs/ufs_vnops.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 4aed4f7db42c..d9e9397631f4 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -542,7 +542,8 @@ ufs_stat(struct vop_stat_args *ap) sb->st_uid = ip->i_uid; sb->st_gid = ip->i_gid; if (I_IS_UFS1(ip)) { - sb->st_rdev = ip->i_din1->di_rdev; + sb->st_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din1->di_rdev : NODEV; sb->st_size = ip->i_din1->di_size; sb->st_mtim.tv_sec = ip->i_din1->di_mtime; sb->st_mtim.tv_nsec = ip->i_din1->di_mtimensec; @@ -553,7 +554,8 @@ ufs_stat(struct vop_stat_args *ap) sb->st_blocks = dbtob((uint64_t)ip->i_din1->di_blocks) / S_BLKSIZE; sb->st_filerev = ip->i_din1->di_modrev; } else { - sb->st_rdev = ip->i_din2->di_rdev; + sb->st_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din2->di_rdev : NODEV; sb->st_size = ip->i_din2->di_size; sb->st_mtim.tv_sec = ip->i_din2->di_mtime; sb->st_mtim.tv_nsec = ip->i_din2->di_mtimensec; @@ -605,7 +607,8 @@ ufs_getattr( vap->va_uid = ip->i_uid; vap->va_gid = ip->i_gid; if (I_IS_UFS1(ip)) { - vap->va_rdev = ip->i_din1->di_rdev; + vap->va_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din1->di_rdev : NODEV; vap->va_size = ip->i_din1->di_size; vap->va_mtime.tv_sec = ip->i_din1->di_mtime; vap->va_mtime.tv_nsec = ip->i_din1->di_mtimensec; @@ -614,7 +617,8 @@ ufs_getattr( vap->va_bytes = dbtob((uint64_t)ip->i_din1->di_blocks); vap->va_filerev = ip->i_din1->di_modrev; } else { - vap->va_rdev = ip->i_din2->di_rdev; + vap->va_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din2->di_rdev : NODEV; vap->va_size = ip->i_din2->di_size; vap->va_mtime.tv_sec = ip->i_din2->di_mtime; vap->va_mtime.tv_nsec = ip->i_din2->di_mtimensec;