diff options
| author | mm <mm@FreeBSD.org> | 2013-03-19 11:09:15 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2013-03-19 11:09:15 +0000 |
| commit | c94cc27299ba2ab2acf00ca31ec90c92a37b16f7 (patch) | |
| tree | dc4e31348d425160553b7ff6655e986ab941fff5 /sys/cddl | |
| parent | 3a10a36ee8940816a53ed53f8b1ca562b85b68a9 (diff) | |
| parent | 38b46fc64e9af0a68fc5ac1ff070b5b90a466812 (diff) | |
| download | FreeBSD-src-c94cc27299ba2ab2acf00ca31ec90c92a37b16f7.zip FreeBSD-src-c94cc27299ba2ab2acf00ca31ec90c92a37b16f7.tar.gz | |
MFC @248493
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/compat/opensolaris/sys/sig.h | 2 | ||||
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/cddl/compat/opensolaris/sys/sig.h b/sys/cddl/compat/opensolaris/sys/sig.h index 5053797..985896e 100644 --- a/sys/cddl/compat/opensolaris/sys/sig.h +++ b/sys/cddl/compat/opensolaris/sys/sig.h @@ -55,7 +55,7 @@ issig(int why) p = td->td_proc; PROC_LOCK(p); mtx_lock(&p->p_sigacts->ps_mtx); - sig = cursig(td, SIG_STOP_ALLOWED); + sig = cursig(td); mtx_unlock(&p->p_sigacts->ps_mtx); PROC_UNLOCK(p); if (sig != 0) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c index b866202..71c749c 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c @@ -919,7 +919,8 @@ dsl_check_snap_cb(const char *name, void *arg) char *dsname; dsname = kmem_asprintf("%s@%s", name, da->snapname); - VERIFY(nvlist_add_boolean(da->nvl, dsname) == 0); + fnvlist_add_boolean(da->nvl, dsname); + kmem_free(dsname, strlen(dsname) + 1); return (0); } |
