From owner-svn-src-head@FreeBSD.ORG  Sat Nov 22 13:22:25 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4C70F1065673;
	Sat, 22 Nov 2008 13:22:25 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 30E198FC18;
	Sat, 22 Nov 2008 13:22:25 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAMDMOZ7018804;
	Sat, 22 Nov 2008 13:22:24 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAMDMOw4018803;
	Sat, 22 Nov 2008 13:22:24 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <200811221322.mAMDMOw4018803@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sat, 22 Nov 2008 13:22:24 +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: r185171 -
	head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
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: Sat, 22 Nov 2008 13:22:25 -0000

Author: pjd
Date: Sat Nov 22 13:22:24 2008
New Revision: 185171
URL: http://svn.freebsd.org/changeset/base/185171

Log:
  IFp4: Don't free pathname too soon, debugging code is still using it.

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c	Sat Nov 22 13:11:11 2008	(r185170)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c	Sat Nov 22 13:22:24 2008	(r185171)
@@ -88,11 +88,9 @@ spa_config_load(void)
 
 	file = kobj_open_file(pathname);
 
-	kmem_free(pathname, MAXPATHLEN);
-
 	if (file == (struct _buf *)-1) {
 		ZFS_LOG(1, "Cannot open %s.", pathname);
-		return;
+		goto out;
 	}
 
 	if (kobj_get_filesize(file, &fsize) != 0) {
@@ -146,10 +144,11 @@ spa_config_load(void)
 	nvlist_free(nvlist);
 
 out:
+	kmem_free(pathname, MAXPATHLEN);
 	if (buf != NULL)
 		kmem_free(buf, fsize);
-
-	kobj_close_file(file);
+	if (file != (struct _buf *)-1)
+		kobj_close_file(file);
 }
 
 static void