From owner-dev-commits-src-branches@freebsd.org Sun Apr 11 07:49:14 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D58BF5E35F0; Sun, 11 Apr 2021 07:49:14 +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 4FJ3sk5d3Wz4tQg; Sun, 11 Apr 2021 07:49:14 +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 B48082026E; Sun, 11 Apr 2021 07:49: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 13B7nE4D056024; Sun, 11 Apr 2021 07:49:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13B7nEDd056023; Sun, 11 Apr 2021 07:49:14 GMT (envelope-from git) Date: Sun, 11 Apr 2021 07:49:14 GMT Message-Id: <202104110749.13B7nEDd056023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2670d879f366 - stable/12 - struct mount uppers: correct locking annotations 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 2670d879f366435ec3072b46d5a4818915b13132 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Apr 2021 07:49:14 -0000 The branch stable/12 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2670d879f366435ec3072b46d5a4818915b13132 commit 2670d879f366435ec3072b46d5a4818915b13132 Author: Konstantin Belousov AuthorDate: 2021-04-08 22:03:06 +0000 Commit: Konstantin Belousov CommitDate: 2021-04-11 07:38:08 +0000 struct mount uppers: correct locking annotations (cherry picked from commit 5af1131de7fc18c795ed28e69d9393f78875d3e5) --- sys/sys/mount.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/sys/mount.h b/sys/sys/mount.h index d099e453ec1a..f1a42cb3d29b 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -186,6 +186,7 @@ struct vfsopt { * l - mnt_listmtx * m - mountlist_mtx * i - interlock + * i* - interlock of uppers' list head * v - vnode freelist mutex * * Unmarked fields are considered stable as long as a ref is held. @@ -229,8 +230,8 @@ struct mount { struct vnodelst mnt_tmpfreevnodelist; /* (l) list of free vnodes */ int mnt_tmpfreevnodelistsize;/* (l) # of free vnodes */ struct lock mnt_explock; /* vfs_export walkers lock */ - TAILQ_ENTRY(mount) mnt_upper_link; /* (m) we in the all uppers */ - TAILQ_HEAD(, mount) mnt_uppers; /* (m) upper mounts over us*/ + TAILQ_ENTRY(mount) mnt_upper_link; /* (i*) we in the all uppers */ + TAILQ_HEAD(, mount) mnt_uppers; /* (i) upper mounts over us */ }; /*