From e416c2c7afb9a286e19c09fdddc71f680544e315 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 6 Aug 2010 13:43:12 -0700 Subject: [PATCH] Revert changes to correct TopGit merge See commit 992e89df073ca0f9b3ff3650972303ff3d20048c --- module/zfs/zfs_ioctl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index 40a6e64cf0..46b461c917 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -150,7 +150,7 @@ __dprintf(const char *file, const char *func, int line, const char *fmt, ...) static void history_str_free(char *buf) { - vmem_free(buf, HIS_MAX_RECORD_LEN); + kmem_free(buf, HIS_MAX_RECORD_LEN); } static char * @@ -161,7 +161,7 @@ history_str_get(zfs_cmd_t *zc) if (zc->zc_history == 0) return (NULL); - buf = vmem_alloc(HIS_MAX_RECORD_LEN, KM_SLEEP); + buf = kmem_alloc(HIS_MAX_RECORD_LEN, KM_SLEEP); if (copyinstr((void *)(uintptr_t)zc->zc_history, buf, HIS_MAX_RECORD_LEN, NULL) != 0) { history_str_free(buf); @@ -4556,7 +4556,7 @@ zfs_ioctl(struct file *filp, unsigned cmd, unsigned long arg) if (vec >= sizeof (zfs_ioc_vec) / sizeof (zfs_ioc_vec[0])) return (-EINVAL); - zc = vmem_zalloc(sizeof (zfs_cmd_t), KM_SLEEP); + zc = kmem_zalloc(sizeof (zfs_cmd_t), KM_SLEEP); error = ddi_copyin((void *)arg, zc, sizeof (zfs_cmd_t), flag); if (error != 0) @@ -4605,7 +4605,7 @@ zfs_ioctl(struct file *filp, unsigned cmd, unsigned long arg) zfs_log_history(zc); } - vmem_free(zc, sizeof (zfs_cmd_t)); + kmem_free(zc, sizeof (zfs_cmd_t)); return (-error); }