diff options
| author | George Wilson <george.wilson@delphix.com> | 2012-01-23 19:46:52 -0800 |
|---|---|---|
| committer | George Wilson <george.wilson@delphix.com> | 2012-01-23 19:46:52 -0800 |
| commit | cd0837cc943a814d8b2e7ff44d61265f67220f66 (patch) | |
| tree | 49204c55c9f6a590be993a41828b34c5f54a9568 /usr/src/uts/common/fs/zfs/zfs_fm.c | |
| parent | d7f601ef8b0a2967964481b924713899dcc045bb (diff) | |
| download | illumos-joyent-cd0837cc943a814d8b2e7ff44d61265f67220f66.tar.gz | |
1951 leaking a vdev when removing an l2cache device
1952 memory leak when adding a file-based l2arc device
1954 leak in ZFS from metaslab_group_create and zfs_ereport_checksum
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Matt Ahrens <matt@delphix.com>
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Reviewed by: Bill Pijewski <wdp@joyent.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Approved by: Eric Schrock <eric.schrock@delphix.com>
Diffstat (limited to 'usr/src/uts/common/fs/zfs/zfs_fm.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_fm.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_fm.c b/usr/src/uts/common/fs/zfs/zfs_fm.c index 0b48126664..fa5903a432 100644 --- a/usr/src/uts/common/fs/zfs/zfs_fm.c +++ b/usr/src/uts/common/fs/zfs/zfs_fm.c @@ -23,6 +23,10 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ + #include <sys/spa.h> #include <sys/spa_impl.h> #include <sys/vdev.h> @@ -709,6 +713,10 @@ zfs_ereport_start_checksum(spa_t *spa, vdev_t *vd, if (report->zcr_ereport == NULL) { report->zcr_free(report->zcr_cbdata, report->zcr_cbinfo); + if (report->zcr_ckinfo != NULL) { + kmem_free(report->zcr_ckinfo, + sizeof (*report->zcr_ckinfo)); + } kmem_free(report, sizeof (*report)); return; } |