From nobody Sat Mar 19 10:50:35 2022 X-Original-To: dev-commits-src-all@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 65FAC1A2CEFE; Sat, 19 Mar 2022 10:50:36 +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 4KLHj75469z4kPK; Sat, 19 Mar 2022 10:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647687035; 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=fK2pITB0mKBw2B2R/sBpVAFWdKH+UHeeYPPJMaUY/jA=; b=EZIVHUh0t2468dsWviq2rfgoYtdvJq5AAnN3S+B5GJWpiog5iVi3t2W2WAin+BekCCCLcC UF4wHqmukJYfIyG4XCUwaXZuN92WjcpuwxEWCSiiZR4q09Vlkq/CPDBYEbiMS4ADvtaYCv e39Q5W9lqQusHOqeKxtLNY4n+RjIaW/bRY2y97Kg8ctTgzyluWYBuTO0TPFk0SB41uO8AV e5I1TmdrvIEuYBd2Q1S+WGDlSqCHZN3FTm6cNL9bzVsyq5cQcX+r+8eTEPMtHYVZagyjnH 4BNyQc188wATN9BIiQhPoVdsZgtZLpClHeq8qhiJSOhtY+qKTGkqIc2nKJXerQ== 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 7322E12016; Sat, 19 Mar 2022 10:50:35 +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 22JAoZtv034056; Sat, 19 Mar 2022 10:50:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22JAoZ2F034055; Sat, 19 Mar 2022 10:50:35 GMT (envelope-from git) Date: Sat, 19 Mar 2022 10:50:35 GMT Message-Id: <202203191050.22JAoZ2F034055@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: 93a0ba8f4990 - main - vfs: retire the no longer used MNTK_LOOKUP_EXCL_DOTDOT flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 93a0ba8f4990785f89c66cb4636da461cede0ee5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647687035; 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=fK2pITB0mKBw2B2R/sBpVAFWdKH+UHeeYPPJMaUY/jA=; b=EoCUL4fVE8aAqckrgXrwl02P4cM/vVwt+pFhj/t+Gz8jV+9P+2YqGsj/OcRa2ON5m3RcWq 5AsNImgPxjrt0t5gMV9I8g6vJK2pwEj2NxbbvZiDDPOiZMw9mzBpEzjK/7HZ/MT6giu6bK XlBSCy2jD1c2xw3qmutt2iB8DzicMZ+fo+o6O84cMMA7+1crQbTPSDkr1ys0eaLiYJFZe5 9bGoSVFJ9bVKlOrKzuYwDHonHcMcmiDUocQbv0disTdMXPT3tbblp8gIuV+8V+5Wto60Y+ BscH9/v5BGCVS+5tfyp23RlanJvo52DFslJh/lcCTGVVEjl21CLz8pz8IcOd0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647687035; a=rsa-sha256; cv=none; b=REtvmwyT0PHMpggkAPKlb0FX+7BAopFfc1q8S9HslPOxKb3LiAWyaun06uXsKQtiT8OAj7 LiA9issR2Sdp/rivL5/tJj2Dro/RTD6KfbJxYcKPV9t/Lb5hX1bwK78co2znl1TSlR/hfl utq7zltWOhejkprIhG1QA8YV06CEKQTW7pQWel4H7wVAmyIB9P/DPZ0hIc5h9DrObyCsV2 LU8O1Eel9tmykbRuDmKDCD1DKTeItf06wshcMapr8BqeEeEEiIl1dp8LNJekZxCjJQvYwS P6qX+nNf22cLmUZvnDT/qV87Ap1XUO1hms2ND02q7acoi8H4ZD7hgZjR0QB8Rg== 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=93a0ba8f4990785f89c66cb4636da461cede0ee5 commit 93a0ba8f4990785f89c66cb4636da461cede0ee5 Author: Mateusz Guzik AuthorDate: 2021-09-18 10:46:03 +0000 Commit: Mateusz Guzik 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. */