From nobody Tue Jul 04 03:18:08 2023 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 4Qw7LF0cSkz4lVGN; Tue, 4 Jul 2023 03:19:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qw7LD435Rz41B6; Tue, 4 Jul 2023 03:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688440740; 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=uwdvTOfvgpzSKupmMhIwAvgAt8twWF1LpWr3dVHLe5c=; b=MPtJE4MvTJNsxWpoSG+uHvdseSI1DDPMvleoVNVoza/sRRcLbGv5FgvAWX25PkgjDLHpO+ r2o/K9SNl9AFW/BZHAJsXnMkpef+ZDssle6FMtWf46IOUJf5de+Mg790MKwGCNb7IKDwml v2tn3Ld1gbp2WOesMAz/AsXj/RunHEK+FNgIWMM81Kc6t3fPdk2jhS43HmJoNkzC9SH+Q6 kNjTcJ3BJ5/y1Msppvs/U+HVqj76eywl0ShsDLDBDNQA93ceLEjPAB4tuoE9Cei2cmwo1Q ZIBj9n4GO0oxmXIWixafwI3C/AJ/g074Rr1uCB46ynerA+QXxiJARDjXBMSyvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688440740; 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=uwdvTOfvgpzSKupmMhIwAvgAt8twWF1LpWr3dVHLe5c=; b=omXgzJCsiuOOC0IMLeScliMhbej2W4gxR7oMkA62ambFAY2sReTrlkBXdVTg5C91WaNCqX IovX7qY4o9CsvjugaQNf6IaK7zXWq0awXFH6RIWRmyDXNduGMfDYf1wWHoOFWDkVoKXAqK HSlwoW85zwCEgp9TGZMHxRCc5wjQYdDHRmk3GA8DSKzlqG4G2cV6u6XjC+8HSXWlCZYaZQ S0uGA52TnCOXNqEKlCByNQj1T7V8bekk6X35HiZRLdvIGeHiArEuNL7xANY06YycUZq6Qw wQBGUbMRYliPivdtQO9ZEhgkkpSjXvxV6fGmdCTi62GkkCkFP+2cKCGKwguF1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688440740; a=rsa-sha256; cv=none; b=KVleE62HUbna4wmOElFPYtlvENHo2pSc1qgYS4Dej0/vV16usz3RsmwH9E+MP8L+AjQssc J16jzHVNcCsZFwR8j0y3KHYK6nyJpFoPt3PkN5Nkr+jX19fsgu0Gaw4+p7dfO5U1/YjXY6 4W20KdG0dohOSyv3+9XrwGKsfpuj1bm5Y2ys5uydJkKVnDmgOPCPE4qvaQcte0nBy9N9u3 RTvrRFMASuW4EKGktB6yTrKH8hVtIXdazEaLq+I8m6kXNPI6wrDEoiXo8WzvofuVsRBSat TKawFJqjC2gUdBUUqNiiIEtSYklTeXL4YL3QbCLdZTuvYtYwfKsorxsMf/nlbw== 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 4Qw7KD2qW9zGlM; Tue, 4 Jul 2023 03:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3643I8De009722; Tue, 4 Jul 2023 03:18:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3643I8EL009721; Tue, 4 Jul 2023 03:18:08 GMT (envelope-from git) Date: Tue, 4 Jul 2023 03:18:08 GMT Message-Id: <202307040318.3643I8EL009721@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: be9fd6f1f283 - stable/13 - VFS: Remove VV_READLINK flag 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: be9fd6f1f283e2ba11916dbb75dc1823cc25b24f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=be9fd6f1f283e2ba11916dbb75dc1823cc25b24f commit be9fd6f1f283e2ba11916dbb75dc1823cc25b24f Author: Konstantin Belousov AuthorDate: 2023-06-21 16:37:30 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-04 03:06:46 +0000 VFS: Remove VV_READLINK flag (cherry picked from commit 4a402dfe0bc44770c9eac6e58a501e4805e29413) --- sys/kern/vfs_subr.c | 5 +---- sys/kern/vfs_syscalls.c | 2 +- sys/sys/vnode.h | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 2002f3b81937..dd742277a98f 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -4263,12 +4263,9 @@ vn_printf(struct vnode *vp, const char *fmt, ...) strlcat(buf, "|VV_MD", sizeof(buf)); if (vp->v_vflag & VV_FORCEINSMQ) strlcat(buf, "|VV_FORCEINSMQ", sizeof(buf)); - if (vp->v_vflag & VV_READLINK) - strlcat(buf, "|VV_READLINK", sizeof(buf)); flags = vp->v_vflag & ~(VV_ROOT | VV_ISTTY | VV_NOSYNC | VV_ETERNALDEV | VV_CACHEDLABEL | VV_VMSIZEVNLOCK | VV_COPYONWRITE | VV_SYSTEM | - VV_PROCDEP | VV_NOKNOTE | VV_DELETED | VV_MD | VV_FORCEINSMQ | - VV_READLINK); + VV_PROCDEP | VV_NOKNOTE | VV_DELETED | VV_MD | VV_FORCEINSMQ); if (flags != 0) { snprintf(buf2, sizeof(buf2), "|VV(0x%lx)", flags); strlcat(buf, buf2, sizeof(buf)); diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 7f7836450811..b7cdac8540da 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -2660,7 +2660,7 @@ kern_readlink_vp(struct vnode *vp, char *buf, enum uio_seg bufseg, size_t count, if (error != 0) return (error); #endif - if (vp->v_type != VLNK && (vp->v_vflag & VV_READLINK) == 0) + if (vp->v_type != VLNK) return (EINVAL); aiov.iov_base = buf; diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 543eb06f2f16..82e9ba9a2237 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -271,7 +271,7 @@ struct xvnode { #define VV_DELETED 0x0400 /* should be removed */ #define VV_MD 0x0800 /* vnode backs the md device */ #define VV_FORCEINSMQ 0x1000 /* force the insmntque to succeed */ -#define VV_READLINK 0x2000 /* fdescfs linux vnode */ +#define VV_UNUSED01 0x2000 /* was: fdescfs linux vnode */ #define VV_UNREF 0x4000 /* vunref, do not drop lock in inactive() */ #define VV_UNLINKED 0x8000 /* unlinked but stil open directory */