git: 2670d879f366 - stable/12 - struct mount uppers: correct locking annotations

[Konstantin Belousov]

The branch stable/12 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=2670d879f366435ec3072b46d5a4818915b13132

commit 2670d879f366435ec3072b46d5a4818915b13132
Author:     Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-04-08 22:03:06 +0000
Commit:     Konstantin Belousov <kib at FreeBSD.org>
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 */
 };
 
 /*