From owner-svn-src-all@FreeBSD.ORG  Sun Jul 10 18:57:36 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 45AE7106566B;
	Sun, 10 Jul 2011 18:57:36 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3660D8FC12;
	Sun, 10 Jul 2011 18:57:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6AIvanC057681;
	Sun, 10 Jul 2011 18:57:36 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6AIvao5057679;
	Sun, 10 Jul 2011 18:57:36 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201107101857.p6AIvao5057679@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 10 Jul 2011 18:57:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223911 - head/sys/sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Jul 2011 18:57:36 -0000

Author: kib
Date: Sun Jul 10 18:57:35 2011
New Revision: 223911
URL: http://svn.freebsd.org/changeset/base/223911

Log:
  Update locking annotations for the struct vnode.
  
  MFC after:	3 days

Modified:
  head/sys/sys/vnode.h

Modified: head/sys/sys/vnode.h
==============================================================================
--- head/sys/sys/vnode.h	Sun Jul 10 16:05:51 2011	(r223910)
+++ head/sys/sys/vnode.h	Sun Jul 10 18:57:35 2011	(r223911)
@@ -75,12 +75,9 @@ struct vpollinfo {
  * Lock reference:
  *	c - namecache mutex
  *	f - freelist mutex
- *	G - Giant
  *	i - interlock
- *	m - mntvnodes mutex
+ *	m - mount point interlock
  *	p - pollinfo lock
- *	s - spechash mutex
- *	S - syncer mutex
  *	u - Only a reference to the vnode is needed to read.
  *	v - vnode lock
  *
@@ -165,7 +162,7 @@ struct vnode {
 	/*
 	 * Hooks for various subsystems and features.
 	 */
-	struct vpollinfo *v_pollinfo;		/* G Poll events, p for *v_pi */
+	struct vpollinfo *v_pollinfo;		/* i Poll events, p for *v_pi */
 	struct label *v_label;			/* MAC label for vnode */
 	struct lockf *v_lockf;			/* Byte-level lock list */
 };