Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Jun 2023 10:43:45 GMT
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 4a402dfe0bc4 - main - VFS: Remove VV_READLINK flag
Message-ID:  <202306271043.35RAhjCM054442@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=4a402dfe0bc44770c9eac6e58a501e4805e29413

commit 4a402dfe0bc44770c9eac6e58a501e4805e29413
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-06-21 16:37:30 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
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 */
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306271043.35RAhjCM054442>