From owner-svn-src-head@FreeBSD.ORG  Fri Oct  5 14:42:38 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D6A0F1065672;
	Fri,  5 Oct 2012 14:42:38 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C1E758FC24;
	Fri,  5 Oct 2012 14:42:38 +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 q95EgcHA087280;
	Fri, 5 Oct 2012 14:42:38 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q95Egcaf087278;
	Fri, 5 Oct 2012 14:42:38 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201210051442.q95Egcaf087278@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 5 Oct 2012 14:42:38 +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: r241225 - head/sys/sys
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2012 14:42:39 -0000

Author: avg
Date: Fri Oct  5 14:42:38 2012
New Revision: 241225
URL: http://svn.freebsd.org/changeset/base/241225

Log:
  mount.h: MNTK_VGONE_UPPER and MNTK_VGONE_WAITER were supposed to be different
  
  ... otherwise a waiter is never woken up.
  
  Reported by:	swills
  Discussed with:	jhb
  Approved by:	kib
  MFC after:	3 days

Modified:
  head/sys/sys/mount.h

Modified: head/sys/sys/mount.h
==============================================================================
--- head/sys/sys/mount.h	Fri Oct  5 14:20:53 2012	(r241224)
+++ head/sys/sys/mount.h	Fri Oct  5 14:42:38 2012	(r241225)
@@ -376,9 +376,9 @@ void          __mnt_vnode_markerfree(str
 					   and writes. Filesystem shall properly
 					   handle i/o state on EFAULT. */
 #define	MNTK_VGONE_UPPER	0x00000200
-#define	MNTK_VGONE_WAITER	0x00000200
-#define	MNTK_MARKER		0x00000400
+#define	MNTK_VGONE_WAITER	0x00000400
 #define	MNTK_LOOKUP_EXCL_DOTDOT	0x00000800
+#define	MNTK_MARKER		0x00001000
 #define MNTK_NOASYNC	0x00800000	/* disable async */
 #define MNTK_UNMOUNT	0x01000000	/* unmount in progress */
 #define	MNTK_MWAIT	0x02000000	/* waiting for unmount to finish */