Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
Conflicts: cmd/zpool/zpool_main.c
This commit is contained in:
commit
a054b40984
|
@ -1785,6 +1785,7 @@ zpool_do_import(int argc, char **argv)
|
|||
"discover pools: permission denied\n"));
|
||||
if (searchdirs != NULL)
|
||||
free(searchdirs);
|
||||
|
||||
nvlist_free(policy);
|
||||
return (1);
|
||||
}
|
||||
|
|
|
@ -970,7 +970,7 @@ put_nvlist(zfs_cmd_t *zc, nvlist_t *nvl)
|
|||
if (size > zc->zc_nvlist_dst_size) {
|
||||
error = ENOMEM;
|
||||
} else {
|
||||
packed = kmem_alloc(size, KM_SLEEP);
|
||||
packed = vmem_alloc(size, KM_SLEEP);
|
||||
VERIFY(nvlist_pack(nvl, &packed, &size, NV_ENCODE_NATIVE,
|
||||
KM_SLEEP) == 0);
|
||||
if (ddi_copyout(packed, (void *)(uintptr_t)zc->zc_nvlist_dst,
|
||||
|
|
Loading…
Reference in New Issue