diff options
| author | George Wilson <[email protected]> | 2012-04-08 13:23:08 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-04-11 11:32:06 -0700 |
| commit | 5ffb9d1d05d7c512b987dff51f587466d537770f (patch) | |
| tree | 9ac15361477cfe4f3e34d1bfb1c27e978dbb3530 /module/zfs/zfs_fm.c | |
| parent | b129c6590e07edcc95f3b64ec210d94cf885c192 (diff) | |
Illumos #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 <[email protected]>
Reviewed by: Matt Ahrens <[email protected]>
Reviewed by: Eric Schrock <[email protected]>
Reviewed by: Bill Pijewski <[email protected]>
Reviewed by: Dan McDonald <[email protected]>
Approved by: Eric Schrock <[email protected]>
References to Illumos issues:
https://www.illumos.org/issues/1951
https://www.illumos.org/issues/1952
https://www.illumos.org/issues/1954
Ported-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #650
Diffstat (limited to 'module/zfs/zfs_fm.c')
| -rw-r--r-- | module/zfs/zfs_fm.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/module/zfs/zfs_fm.c b/module/zfs/zfs_fm.c index 74f2756e3..7801837f1 100644 --- a/module/zfs/zfs_fm.c +++ b/module/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> @@ -706,6 +710,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; } |