From nobody Fri Dec 10 19:54:14 2021 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 4CC0318E1FBE; Fri, 10 Dec 2021 19:54:15 +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 4J9hS70GMwz4bQY; Fri, 10 Dec 2021 19:54:15 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DD070207F3; Fri, 10 Dec 2021 19:54:14 +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 1BAJsE5R056625; Fri, 10 Dec 2021 19:54:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BAJsEPJ056624; Fri, 10 Dec 2021 19:54:14 GMT (envelope-from git) Date: Fri, 10 Dec 2021 19:54:14 GMT Message-Id: <202112101954.1BAJsEPJ056624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 4dd23ae15038 - main - vfs: retire MNTK_NOKNOTE and VV_NOKNOTE 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4dd23ae15038a77866d1e9662723970c0f872ae2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639166055; 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=QbXNIfn11AIAZhvlqJb/owN9d36lOuhYjq0lRm6/ffQ=; b=ui3QLJyOqlcklytrA1jkMjvUBA7HIzV0uaMdGTqEEFgqy/KWDMQE5DtwiOoWp7fqR1PBTZ yHhk/iNv1sL7hDDR3146V/2IlsSV0aoWd3PdaBDFxPydR23kXv7Qr61VTh3J6aDAqinB/s 4BXG9Od/VE3MnlbR0JocgwoD4zrmgoi/qH4sFErqs0SCMPzmDEr7/vGoLYmMCZ2l3SGt/3 MsaJhnaXH3jC1EV4mdMC/QZ7K3/BUzyiDEdgOYeb/7fktimqP03UxXG78MKDFgLuceKtEU oo7VDKKJF4SoHUNRMoMXvJtrSlK6s+E7AAmbGqssr+2KEPoIUBWjwun7VKgcPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639166055; a=rsa-sha256; cv=none; b=n5W2u+sr4BUcjPdOBy93ul+g0kBALgSvUdOPZWBuT2YbNb7BR0Yx61J74lE8FxXUYAQXZq 9YTzGkYCxt04UX/tr/wtvjtSHUN7P8Ego6lGLHgxFDXgPEdcV3iXVL+CJgzES644Bt10Cp dHQVaRREbSqrQ+FFKAGeaOV6c268WtMFnaID2KuXFhJ96wFFNEymZl+98mr3z4F0spPRHN hvoVNt9q6REWkkqsfZP/X3gpF6RawHz5wJA7UgsHsv9Lu+Irg2VaICWtEqSoAKix5IHn4s lInxdRFIbO/AIyU0hzk0h4ZFLoDHvKe5XpLzkQDGl6mA2gWrnWRxra6m1YVxBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=4dd23ae15038a77866d1e9662723970c0f872ae2 commit 4dd23ae15038a77866d1e9662723970c0f872ae2 Author: Mateusz Guzik AuthorDate: 2021-12-10 14:08:26 +0000 Commit: Mateusz Guzik CommitDate: 2021-12-10 19:53:57 +0000 vfs: retire MNTK_NOKNOTE and VV_NOKNOTE MNTK_NOKNOTE was introduced in 679985d03a64f5dfb4355538ae6e3b70f8347f38 (dated 2005), VV_NOKNOTE in 34cc826ae8999f454dd6cb9c77d17ce83b169f92 few months later. Neither was ever used by anything in the tree. --- sys/kern/vfs_subr.c | 8 +------- sys/sys/mount.h | 8 +++----- sys/sys/vnode.h | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 06ca5dc7d93a..7b358b4d8260 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1814,8 +1814,6 @@ getnewvnode(const char *tag, struct mount *mp, struct vop_vector *vops, #endif if (mp != NULL) { vp->v_bufobj.bo_bsize = mp->mnt_stat.f_iosize; - if ((mp->mnt_kern_flag & MNTK_NOKNOTE) != 0) - vp->v_vflag |= VV_NOKNOTE; } /* @@ -4147,8 +4145,6 @@ vn_printf(struct vnode *vp, const char *fmt, ...) strlcat(buf, "|VV_SYSTEM", sizeof(buf)); if (vp->v_vflag & VV_PROCDEP) strlcat(buf, "|VV_PROCDEP", sizeof(buf)); - if (vp->v_vflag & VV_NOKNOTE) - strlcat(buf, "|VV_NOKNOTE", sizeof(buf)); if (vp->v_vflag & VV_DELETED) strlcat(buf, "|VV_DELETED", sizeof(buf)); if (vp->v_vflag & VV_MD) @@ -4159,8 +4155,7 @@ vn_printf(struct vnode *vp, const char *fmt, ...) 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_DELETED | VV_MD | VV_FORCEINSMQ | VV_READLINK); if (flags != 0) { snprintf(buf2, sizeof(buf2), "|VV(0x%lx)", flags); strlcat(buf, buf2, sizeof(buf)); @@ -4358,7 +4353,6 @@ DB_SHOW_COMMAND(mount, db_show_mount) MNT_KERN_FLAG(MNTK_SUSPEND2); MNT_KERN_FLAG(MNTK_SUSPENDED); MNT_KERN_FLAG(MNTK_LOOKUP_SHARED); - MNT_KERN_FLAG(MNTK_NOKNOTE); #undef MNT_KERN_FLAG if (flags != 0) { if (buf[0] != '\0') diff --git a/sys/sys/mount.h b/sys/sys/mount.h index d47d67f1156b..55672affccdf 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -504,7 +504,7 @@ struct mntoptnames { #define MNTK_NULL_NOCACHE 0x20000000 /* auto disable cache for nullfs mounts over this fs */ #define MNTK_LOOKUP_SHARED 0x40000000 /* FS supports shared lock lookups */ -#define MNTK_NOKNOTE 0x80000000 /* Don't send KNOTEs from VOP hooks */ +#define MNTK_UNUSED1 0x80000000 /* unused */ #ifdef _KERNEL static inline int @@ -928,14 +928,12 @@ vfs_statfs_t __vfs_statfs; #define VFS_KNOTE_LOCKED(vp, hint) do \ { \ - if (((vp)->v_vflag & VV_NOKNOTE) == 0) \ - VN_KNOTE((vp), (hint), KNF_LISTLOCKED); \ + VN_KNOTE((vp), (hint), KNF_LISTLOCKED); \ } while (0) #define VFS_KNOTE_UNLOCKED(vp, hint) do \ { \ - if (((vp)->v_vflag & VV_NOKNOTE) == 0) \ - VN_KNOTE((vp), (hint), 0); \ + VN_KNOTE((vp), (hint), 0); \ } while (0) #define VFS_NOTIFY_UPPER_RECLAIM 1 diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 53b0a45064b9..a1dbdcff4cb5 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -270,7 +270,7 @@ struct xvnode { #define VV_COPYONWRITE 0x0040 /* vnode is doing copy-on-write */ #define VV_SYSTEM 0x0080 /* vnode being used by kernel */ #define VV_PROCDEP 0x0100 /* vnode is process dependent */ -#define VV_NOKNOTE 0x0200 /* don't activate knotes on this vnode */ +/* UNUSED 0x0200 */ #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 */