From owner-svn-src-head@FreeBSD.ORG  Wed Apr 18 19:30:22 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 D7F281065675;
	Wed, 18 Apr 2012 19:30:22 +0000 (UTC)
	(envelope-from mckusick@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C36D38FC1C;
	Wed, 18 Apr 2012 19:30:22 +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 q3IJUMIt047416;
	Wed, 18 Apr 2012 19:30:22 GMT
	(envelope-from mckusick@svn.freebsd.org)
Received: (from mckusick@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3IJUMs4047414;
	Wed, 18 Apr 2012 19:30:22 GMT
	(envelope-from mckusick@svn.freebsd.org)
Message-Id: <201204181930.q3IJUMs4047414@svn.freebsd.org>
From: Kirk McKusick <mckusick@FreeBSD.org>
Date: Wed, 18 Apr 2012 19:30:22 +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: r234441 - head/sys/kern
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: Wed, 18 Apr 2012 19:30:22 -0000

Author: mckusick
Date: Wed Apr 18 19:30:22 2012
New Revision: 234441
URL: http://svn.freebsd.org/changeset/base/234441

Log:
  Fix a memory leak of M_VNODE_MARKER introduced in 234386.
  
  Found by:  Peter Holm

Modified:
  head/sys/kern/vfs_subr.c

Modified: head/sys/kern/vfs_subr.c
==============================================================================
--- head/sys/kern/vfs_subr.c	Wed Apr 18 19:25:37 2012	(r234440)
+++ head/sys/kern/vfs_subr.c	Wed Apr 18 19:30:22 2012	(r234441)
@@ -4528,10 +4528,10 @@ __mnt_vnode_first_all(struct vnode **mvp
 
 	/* Check if we are done */
 	if (vp == NULL) {
-		*mvp = NULL;
 		MNT_REL(mp);
 		MNT_IUNLOCK(mp);
 		free(*mvp, M_VNODE_MARKER);
+		*mvp = NULL;
 		return (NULL);
 	}
 	(*mvp)->v_mount = mp;