Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 

Conflicts:
	cmd/zpool/zpool_main.c
This commit is contained in:
Brian Behlendorf 2010-05-28 22:20:07 -07:00
parent 46f6003520 8c67d72771
commit a054b40984
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/zpool/zpool_main.c
View File

@ -1785,6 +1785,7 @@ zpool_do_import(int argc, char **argv)
"discover pools: permission denied\n")); "discover pools: permission denied\n"));
if (searchdirs != NULL) if (searchdirs != NULL)
free(searchdirs); free(searchdirs);
nvlist_free(policy); nvlist_free(policy);
return (1); return (1);
} }

2
module/zfs/zfs_ioctl.c
View File

@ -970,7 +970,7 @@ put_nvlist(zfs_cmd_t *zc, nvlist_t *nvl)
if (size > zc->zc_nvlist_dst_size) { if (size > zc->zc_nvlist_dst_size) {
error = ENOMEM; error = ENOMEM;
} else { } else {
packed = kmem_alloc(size, KM_SLEEP); packed = vmem_alloc(size, KM_SLEEP);
VERIFY(nvlist_pack(nvl, &packed, &size, NV_ENCODE_NATIVE, VERIFY(nvlist_pack(nvl, &packed, &size, NV_ENCODE_NATIVE,
KM_SLEEP) == 0); KM_SLEEP) == 0);
if (ddi_copyout(packed, (void *)(uintptr_t)zc->zc_nvlist_dst, if (ddi_copyout(packed, (void *)(uintptr_t)zc->zc_nvlist_dst,