Date: Sat, 12 Jun 2010 11:25:57 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r209099 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <201006121125.o5CBPvKE084699@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Sat Jun 12 11:25:57 2010 New Revision: 209099 URL: http://svn.freebsd.org/changeset/base/209099 Log: Fix possible zfs panic on zpool import OpenSolaris onnv-revision: 10040:38b25aeeaf7a Obtained from: OpenSolaris (Bug ID 6857012) Approved by: pjd, delphij (mentor) MFC after: 3 days Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Sat Jun 12 11:24:10 2010 (r209098) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Sat Jun 12 11:25:57 2010 (r209099) @@ -96,7 +96,6 @@ dsl_dir_open_obj(dsl_pool_t *dp, uint64_ #endif if (dd == NULL) { dsl_dir_t *winner; - int err; dd = kmem_zalloc(sizeof (dsl_dir_t), KM_SLEEP); dd->dd_object = ddobj;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006121125.o5CBPvKE084699>