diff options
| author | mm <mm@FreeBSD.org> | 2010-06-12 11:25:57 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2010-06-12 11:25:57 +0000 |
| commit | 9a68899bb4cfc5a2d960e92ca42afcf891dcf57d (patch) | |
| tree | c9c17a8797c75d36f4c62af3c0351de6284a56a9 | |
| parent | b9b5f9e6aa1087bbbfbfe34b4010b9642245e835 (diff) | |
| download | FreeBSD-src-9a68899bb4cfc5a2d960e92ca42afcf891dcf57d.zip FreeBSD-src-9a68899bb4cfc5a2d960e92ca42afcf891dcf57d.tar.gz | |
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
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c | 1 |
1 files changed, 0 insertions, 1 deletions
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; |
