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

Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 

Conflicts:
	module/zfs/zfs_ioctl.c
This commit is contained in:
Brian Behlendorf 2010-05-28 22:18:29 -07:00
parent fe4485488c 5e8f78191e
commit d07f996713
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/zfs/zfs_ioctl.c
View File

@ -976,7 +976,7 @@ put_nvlist(zfs_cmd_t *zc, nvlist_t *nvl)
if (ddi_copyout(packed, (void *)(uintptr_t)zc->zc_nvlist_dst, if (ddi_copyout(packed, (void *)(uintptr_t)zc->zc_nvlist_dst,
size, zc->zc_iflags) != 0) size, zc->zc_iflags) != 0)
error = EFAULT; error = EFAULT;
kmem_free(packed, size); vmem_free(packed, size);
} }
zc->zc_nvlist_dst_size = size; zc->zc_nvlist_dst_size = size;