The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=93a0ba8f4990785f89c66cb4636da461cede0ee5
commit 93a0ba8f4990785f89c66cb4636da461cede0ee5 Author: Mateusz Guzik <[email protected]> AuthorDate: 2021-09-18 10:46:03 +0000 Commit: Mateusz Guzik <[email protected]> CommitDate: 2022-03-19 10:47:29 +0000 vfs: retire the no longer used MNTK_LOOKUP_EXCL_DOTDOT flag Reviewed by: markj Tested by: pho (previous version) Differential Revision: https://reviews.freebsd.org/D34466 --- sys/kern/vfs_lookup.c | 4 +--- sys/kern/vfs_subr.c | 1 - sys/sys/mount.h | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index cb0a9c2a216c..1252f4c54d31 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -756,9 +756,7 @@ compute_cn_lkflags(struct mount *mp, int lkflags, int cnflags) { if (mp == NULL || ((lkflags & LK_SHARED) && - (!(mp->mnt_kern_flag & MNTK_LOOKUP_SHARED) || - ((cnflags & ISDOTDOT) && - (mp->mnt_kern_flag & MNTK_LOOKUP_EXCL_DOTDOT))))) { + !(mp->mnt_kern_flag & MNTK_LOOKUP_SHARED))) { lkflags &= ~LK_SHARED; lkflags |= LK_EXCLUSIVE; } diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 7442153371a6..18965d5cb518 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -4405,7 +4405,6 @@ DB_SHOW_COMMAND(mount, db_show_mount) MNT_KERN_FLAG(MNTK_NO_IOPF); MNT_KERN_FLAG(MNTK_RECURSE); MNT_KERN_FLAG(MNTK_UPPER_WAITER); - MNT_KERN_FLAG(MNTK_LOOKUP_EXCL_DOTDOT); MNT_KERN_FLAG(MNTK_UNLOCKED_INSMNTQUE); MNT_KERN_FLAG(MNTK_USES_BCACHE); MNT_KERN_FLAG(MNTK_FPLOOKUP); diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 15aa7dff1e27..0434aeaa38c5 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -486,7 +486,7 @@ struct mntoptnames { handle i/o state on EFAULT. */ #define MNTK_RECURSE 0x00000200 /* pending recursive unmount */ #define MNTK_UPPER_WAITER 0x00000400 /* waiting to drain MNTK_UPPER_PENDING */ -#define MNTK_LOOKUP_EXCL_DOTDOT 0x00000800 +/* UNUSED 0x00000800 */ #define MNTK_UNLOCKED_INSMNTQUE 0x00001000 /* fs does not lock the vnode for insmntque */ #define MNTK_UNMAPPED_BUFS 0x00002000 #define MNTK_USES_BCACHE 0x00004000 /* FS uses the buffer cache. */
