From nobody Fri Aug 29 03:15:06 2025 X-Original-To: dev-commits-src-branches@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 4cCk0W2zNfz65vgS; Fri, 29 Aug 2025 03:15:07 +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 4cCk0V3tBPz3Y1K; Fri, 29 Aug 2025 03:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756437306; 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=od/ifHK/urio2QQehFD9E1a/M03FOKKOtABA6xT2AF4=; b=MQKpWNwQHX+2b7VH40/IpeHty6j5mlYwlCL0h7ijQ9VT7QBUlEG/qz1uT1ek2+pOOcxoeW atDVBYeTZz/s9DJ9Wvrulj8UrIA36hbovzI7E6cvzekjdmq4fuXJK3mF2NDgK0eJPHzmx2 gqa2I5h+h27KB1PphvwpAhp5DrPIuD71gEeNflTQkkEE33OhxUyOTXdZSSumWokAjBNVf/ B3AJpM14X110sompHNb+oW00Pa54U9lj765noSBUsps2E/90m0Yh4o7E7fdgFZB/1E9QYR W4aYqa50XBbOvz7flHaN+2niD8nTlPQsE7QGqeIlUeSKTVIuqTHzuQ+bFHb93w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756437306; 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=od/ifHK/urio2QQehFD9E1a/M03FOKKOtABA6xT2AF4=; b=HfVCBLS23pCQCUauo/so/cGIGQHiVxyfCEYYA+80/mc6SY5GA6A7F4x0xdirOqRviIbmmX rvBE7cimi1A3twzzz4wKeiwGQKoNxME+45io6+dVmJdxa6EILPSOKmfN5cDreRb8Jda34u CF4Yc8PhKjenWbWFVyjY8ZtG3rWfi6o4s/vxbc4Rq++LTIoLwRhk5PeF2cgV99S9c1+f3e hFKisWfaaSumx1FEP+q4RCxqc4ZHsAB9RkDHONGIX/zmjj2QbPgfB1ZFefdDD7lNktY+o3 cyNJnAVEK+FjBtXmuTdcQJYnKs0pLuWqBH2FVvp/N+TxlE0857c1CBMhHy/9rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756437306; a=rsa-sha256; cv=none; b=cXJ4hAP07Tw5efwphRhOLTgpnRpi9AxQ6es+Hl3L6jwczBId+ZXNcOfv9ULWcZWhKUvkE3 ZPo8WJ1IwthZQalBBXU0uYRWaq6KSg76UamfW8MQpwB5GA4YnDbBASUsRxJjKx6hljUbXv EOCokOpFmlLf/I0vF1drYMzIyiwmgtF3gLOZ69viLSYakClF9ctdHt5irIK0ISKyHPOD23 7T+g3skdNoY+igMCll57kpWHICDVeo4Ucj9U/XRpkqhg7fTHv/YDh6FZ1Rp4znc9vIPRp0 IgNIK+9ZnhU3Z3+s40VzV7ToPjvnp/uKT2gt+mBdKMVQ76jQiHs0sRlZaZWXOQ== 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 4cCk0V2w5Yz6RW; Fri, 29 Aug 2025 03:15:06 +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 57T3F6h5047846; Fri, 29 Aug 2025 03:15:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57T3F6ck047843; Fri, 29 Aug 2025 03:15:06 GMT (envelope-from git) Date: Fri, 29 Aug 2025 03:15:06 GMT Message-Id: <202508290315.57T3F6ck047843@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: 4d294b72f8e3 - stable/14 - nfsclient: va_rdev should be NODEV for non-special nodes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 4d294b72f8e31c0f9589d2f9cb3799d4391e0189 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4d294b72f8e31c0f9589d2f9cb3799d4391e0189 commit 4d294b72f8e31c0f9589d2f9cb3799d4391e0189 Author: Konstantin Belousov AuthorDate: 2025-08-18 02:46:18 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-28 18:14:24 +0000 nfsclient: va_rdev should be NODEV for non-special nodes (cherry picked from commit 6acc5ed5f9c3e1b462e7ae0d1ae1c5196328fa9f) --- sys/fs/nfs/nfsport.h | 2 +- sys/fs/nfsclient/nfs_clport.c | 6 +++--- sys/fs/nfsclient/nfs_clvnops.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h index 557ed0a5dfc9..7dab98b06e70 100644 --- a/sys/fs/nfs/nfsport.h +++ b/sys/fs/nfs/nfsport.h @@ -1010,7 +1010,7 @@ MALLOC_DECLARE(M_NEWNFSDSESSION); int nfscl_loadattrcache(struct vnode **, struct nfsvattr *, void *, int, int); int newnfs_realign(struct mbuf **, int); bool ncl_pager_setsize(struct vnode *vp, u_quad_t *nsizep); -void ncl_copy_vattr(struct vattr *dst, struct vattr *src); +void ncl_copy_vattr(struct vnode *vp, struct vattr *dst, struct vattr *src); /* * If the port runs on an SMP box that can enforce Atomic ops with low diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index 4e3a699fb170..27d96f19420e 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -412,7 +412,7 @@ nfscl_warn_fileid(struct nfsmount *nmp, struct nfsvattr *oldnap, } void -ncl_copy_vattr(struct vattr *dst, struct vattr *src) +ncl_copy_vattr(struct vnode *vp, struct vattr *dst, struct vattr *src) { dst->va_type = src->va_type; dst->va_mode = src->va_mode; @@ -429,7 +429,7 @@ ncl_copy_vattr(struct vattr *dst, struct vattr *src) dst->va_birthtime = src->va_birthtime; dst->va_gen = src->va_gen; dst->va_flags = src->va_flags; - dst->va_rdev = src->va_rdev; + dst->va_rdev = VN_ISDEV(vp) ? src->va_rdev : NODEV; dst->va_bytes = src->va_bytes; dst->va_filerev = src->va_filerev; } @@ -595,7 +595,7 @@ nfscl_loadattrcache(struct vnode **vpp, struct nfsvattr *nap, void *nvaper, KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp); } if (vaper != NULL) { - ncl_copy_vattr(vaper, vap); + ncl_copy_vattr(vp, vaper, vap); if (np->n_flag & NCHG) { if (np->n_flag & NACC) vaper->va_atime = np->n_atim; diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index ae69d499c425..7f751d81d5e5 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1004,7 +1004,7 @@ nfs_getattr(struct vop_getattr_args *ap) * cached attributes should be ignored. */ if (nmp->nm_fhsize > 0 && ncl_getattrcache(vp, &vattr) == 0) { - ncl_copy_vattr(vap, &vattr); + ncl_copy_vattr(vp, vap, &vattr); /* * Get the local modify time for the case of a write