From 9a68899bb4cfc5a2d960e92ca42afcf891dcf57d Mon Sep 17 00:00:00 2001 From: mm Date: Sat, 12 Jun 2010 11:25:57 +0000 Subject: 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 --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c index 48d87f9..96b5005 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c @@ -96,7 +96,6 @@ dsl_dir_open_obj(dsl_pool_t *dp, uint64_t ddobj, #endif if (dd == NULL) { dsl_dir_t *winner; - int err; dd = kmem_zalloc(sizeof (dsl_dir_t), KM_SLEEP); dd->dd_object = ddobj; -- cgit v1.1