From nobody Tue Jun 27 10:43:45 2023 X-Original-To: dev-commits-src-main@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 4Qr1Xf1q97z4gBYc; Tue, 27 Jun 2023 10:43:46 +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 4Qr1Xf1LYLz3l89; Tue, 27 Jun 2023 10:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687862626; 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=CKvYilyzS3wz6UeM0pcy29ZrZZYiE1LYebfNpR+O+Po=; b=gkMULY6KvlhaSSU2gY/7+WfSbPPcv+1rfU5KLc0MQ7P8q32WzLgvRunrnIEe9ahWmbb06e zyXhbfJG7qhvz4tDxYRA1O85KuPPyoCmdZTAGe5BxSYZIkFmshr6jjlS8EtsgePUQ9odMp Vrruf8BHR3c0AjiNmsq5jG85ywQcNb515X6Blzowlo7thIlr07TYbNiwDeJhAUTy4TtHqM j2OSijqn56cHGxB+Z7xeqAx9+RGsujVpwZc7Cmf+9d5VnfkvmiOC2hUozDOECHFIPV0hUu H9bqCbCGW/z+vtBanYjGnuzQ54DipTunWzoUbZYAnpVRJqygzivx3eK2FKViUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687862626; 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=CKvYilyzS3wz6UeM0pcy29ZrZZYiE1LYebfNpR+O+Po=; b=C2WbqjiV7vJcF9V8D9cA06LKBAvucl962Q2uXrb6XG11I3SFKpIYgn8/gULkWmZeOm+Ajp wt6C7N/Q/Hy8mo+l1cEstKVoVQ45/qQWOPhDdX0ObRdmwQR5UOm9jcsL2OqZJbJtvxE9Im hSjOgOr/DmyAEddO1kVRsNhDGCP7QIbwD7sznU0+Y+Ooo5RDb3leXKLcmWePrsb8FutvEZ L4CWON/n/y5/D5k4Znz9SY37Oz2Z9Rx74sJ5ULM9iinMEzsW8XZz0/5uh8AdjlV+s9PX4E pdvtdX1hMhtBDjqHkkjiBhWjuTPn/0ipT1fGrDn8JhcDaONAZAqruuAAJ0QCwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687862626; a=rsa-sha256; cv=none; b=iTnOQ+1/3IEANvjuVaf0ZJGK/ue5SDCD12y+eMeHOR6/3maGhpBrcmB2mUy8i6GuBzBF7C mmSszAk7/u9uwaXNSOs9c8L3/7g93v11coxoWYWZjDg/2Ou1ZBMyq1Wfm+bUQlOMCBMsnR 142p77CHbofqcYmQTIazJ9kXGwrkQzA+6Lbpz5Mbe6FAC22dqCIsxr5usYydOl2RCo2w1j +OhqFu5GFakQ4eJrxv5Lh49NN9zsEZPaw1IO4uz0LatP6L8p7jjQmCI67qe9IsNVyf++ZS JnaHKNKjPwqmN+TzxRjZVmfZnnMyv6t3q5hBvp25IJPLrX6BZTwX8ywuTBINiA== 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 4Qr1Xf086NzpFl; Tue, 27 Jun 2023 10:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35RAhjLV054443; Tue, 27 Jun 2023 10:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35RAhjCM054442; Tue, 27 Jun 2023 10:43:45 GMT (envelope-from git) Date: Tue, 27 Jun 2023 10:43:45 GMT Message-Id: <202306271043.35RAhjCM054442@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 4a402dfe0bc4 - main - VFS: Remove VV_READLINK flag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4a402dfe0bc44770c9eac6e58a501e4805e29413 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4a402dfe0bc44770c9eac6e58a501e4805e29413 commit 4a402dfe0bc44770c9eac6e58a501e4805e29413 Author: Konstantin Belousov AuthorDate: 2023-06-21 16:37:30 +0000 Commit: Konstantin Belousov CommitDate: 2023-06-27 10:43:25 +0000 VFS: Remove VV_READLINK flag since its only reason to exist is removed. Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D40700 --- sys/kern/vfs_subr.c | 4 +--- sys/kern/vfs_syscalls.c | 2 +- sys/sys/vnode.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 9901a20172a4..252e0ca60c3b 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -4284,11 +4284,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_DELETED | VV_MD | VV_FORCEINSMQ | VV_READLINK); + VV_PROCDEP | 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 d68af4ea4d51..52145ece7120 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -2677,7 +2677,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 7ba95de34b5d..428bf31b3996 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -251,7 +251,7 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); #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_CROSSLOCK 0x8000 /* vnode lock is shared w/ root mounted here */