Module Name: src
Committed By: jdolecek
Date: Mon Oct 22 19:38:06 UTC 2018
Modified Files:
src/sys/dev/ata: ata_raid.c ata_raid_adaptec.c ata_raid_intel.c
ata_raid_jmicron.c ata_raid_nvidia.c ata_raid_promise.c
ata_raid_via.c
Log Message:
convert from malloc(9) to kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/ata/ata_raid.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ata/ata_raid_adaptec.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ata/ata_raid_intel.c \
src/sys/dev/ata/ata_raid_via.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ata/ata_raid_jmicron.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ata/ata_raid_nvidia.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ata/ata_raid_promise.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ata/ata_raid.c
diff -u src/sys/dev/ata/ata_raid.c:1.40 src/sys/dev/ata/ata_raid.c:1.41
--- src/sys/dev/ata/ata_raid.c:1.40 Fri Jun 22 09:06:04 2018
+++ src/sys/dev/ata/ata_raid.c Mon Oct 22 19:38:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid.c,v 1.40 2018/06/22 09:06:04 pgoyette Exp $ */
+/* $NetBSD: ata_raid.c,v 1.41 2018/10/22 19:38:06 jdolecek Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.40 2018/06/22 09:06:04 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.41 2018/10/22 19:38:06 jdolecek Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v
#include <sys/disk.h>
#include <sys/disklabel.h>
#include <sys/fcntl.h>
-#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/proc.h>
#include <sys/module.h>
@@ -274,7 +273,7 @@ ata_raid_get_array_info(u_int type, u_in
}
/* Need to allocate a new one. */
- aai = malloc(sizeof(*aai), M_DEVBUF, M_WAITOK | M_ZERO);
+ aai = kmem_zalloc(sizeof(*aai), KM_SLEEP);
aai->aai_type = type;
aai->aai_arrayno = arrayno;
aai->aai_curdisk = 0;
Index: src/sys/dev/ata/ata_raid_adaptec.c
diff -u src/sys/dev/ata/ata_raid_adaptec.c:1.10 src/sys/dev/ata/ata_raid_adaptec.c:1.11
--- src/sys/dev/ata/ata_raid_adaptec.c:1.10 Wed Nov 1 19:34:46 2017
+++ src/sys/dev/ata/ata_raid_adaptec.c Mon Oct 22 19:38:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid_adaptec.c,v 1.10 2017/11/01 19:34:46 mlelstv Exp $ */
+/* $NetBSD: ata_raid_adaptec.c,v 1.11 2018/10/22 19:38:06 jdolecek Exp $ */
/*-
* Copyright (c) 2000,2001,2002 Søren Schmidt <s...@freebsd.org>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_adaptec.c,v 1.10 2017/11/01 19:34:46 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_adaptec.c,v 1.11 2018/10/22 19:38:06 jdolecek Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: ata_raid_ada
#include <sys/disk.h>
#include <sys/disklabel.h>
#include <sys/fcntl.h>
-#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/kauth.h>
@@ -77,7 +76,7 @@ ata_raid_read_config_adaptec(struct wd_s
struct ataraid_array_info *aai;
struct ataraid_disk_info *adi;
- info = malloc(sizeof(*info), M_DEVBUF, M_WAITOK);
+ info = kmem_zalloc(sizeof(*info), KM_SLEEP);
bmajor = devsw_name2blk(dksc->sc_xname, NULL, 0);
@@ -189,6 +188,6 @@ ata_raid_read_config_adaptec(struct wd_s
error = 0;
out:
- free(info, M_DEVBUF);
+ kmem_free(info, sizeof(*info));
return (error);
}
Index: src/sys/dev/ata/ata_raid_intel.c
diff -u src/sys/dev/ata/ata_raid_intel.c:1.8 src/sys/dev/ata/ata_raid_intel.c:1.9
--- src/sys/dev/ata/ata_raid_intel.c:1.8 Wed Nov 1 19:34:46 2017
+++ src/sys/dev/ata/ata_raid_intel.c Mon Oct 22 19:38:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid_intel.c,v 1.8 2017/11/01 19:34:46 mlelstv Exp $ */
+/* $NetBSD: ata_raid_intel.c,v 1.9 2018/10/22 19:38:06 jdolecek Exp $ */
/*-
* Copyright (c) 2000-2008 Søren Schmidt <s...@freebsd.org>
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_intel.c,v 1.8 2017/11/01 19:34:46 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_intel.c,v 1.9 2018/10/22 19:38:06 jdolecek Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: ata_raid_int
#include <sys/disk.h>
#include <sys/disklabel.h>
#include <sys/fcntl.h>
-#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/kauth.h>
@@ -138,6 +137,7 @@ ata_raid_read_config_intel(struct wd_sof
{
struct dk_softc *dksc = &sc->sc_dksc;
struct intel_raid_conf *info;
+ const size_t infosz = 1536;
struct intel_raid_mapping *map;
struct ataraid_array_info *aai;
struct ataraid_disk_info *adi;
@@ -148,7 +148,7 @@ ata_raid_read_config_intel(struct wd_sof
dev_t dev;
int volumeid, diskidx;
- info = malloc(1536, M_DEVBUF, M_WAITOK|M_ZERO);
+ info = kmem_zalloc(infosz, KM_SLEEP);
bmajor = devsw_name2blk(dksc->sc_xname, NULL, 0);
@@ -298,7 +298,7 @@ findvol:
}
out:
- free(info, M_DEVBUF);
+ kmem_free(info, infosz);
return error;
}
Index: src/sys/dev/ata/ata_raid_via.c
diff -u src/sys/dev/ata/ata_raid_via.c:1.8 src/sys/dev/ata/ata_raid_via.c:1.9
--- src/sys/dev/ata/ata_raid_via.c:1.8 Wed Nov 1 19:34:46 2017
+++ src/sys/dev/ata/ata_raid_via.c Mon Oct 22 19:38:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid_via.c,v 1.8 2017/11/01 19:34:46 mlelstv Exp $ */
+/* $NetBSD: ata_raid_via.c,v 1.9 2018/10/22 19:38:06 jdolecek Exp $ */
/*-
* Copyright (c) 2000,2001,2002 Søren Schmidt <s...@freebsd.org>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_via.c,v 1.8 2017/11/01 19:34:46 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_via.c,v 1.9 2018/10/22 19:38:06 jdolecek Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: ata_raid_via
#include <sys/disk.h>
#include <sys/disklabel.h>
#include <sys/fcntl.h>
-#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/kauth.h>
@@ -126,7 +125,7 @@ ata_raid_read_config_via(struct wd_softc
struct ataraid_array_info *aai;
struct ataraid_disk_info *adi;
- info = malloc(sizeof(*info), M_DEVBUF, M_WAITOK);
+ info = kmem_zalloc(sizeof(*info), KM_SLEEP);
bmajor = devsw_name2blk(dksc->sc_xname, NULL, 0);
@@ -258,6 +257,6 @@ ata_raid_read_config_via(struct wd_softc
error = 0;
out:
- free(info, M_DEVBUF);
+ kmem_free(info, sizeof(*info));
return (error);
}
Index: src/sys/dev/ata/ata_raid_jmicron.c
diff -u src/sys/dev/ata/ata_raid_jmicron.c:1.6 src/sys/dev/ata/ata_raid_jmicron.c:1.7
--- src/sys/dev/ata/ata_raid_jmicron.c:1.6 Wed Nov 1 19:34:46 2017
+++ src/sys/dev/ata/ata_raid_jmicron.c Mon Oct 22 19:38:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid_jmicron.c,v 1.6 2017/11/01 19:34:46 mlelstv Exp $ */
+/* $NetBSD: ata_raid_jmicron.c,v 1.7 2018/10/22 19:38:06 jdolecek Exp $ */
/*-
* Copyright (c) 2000-2008 Søren Schmidt <s...@freebsd.org>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_jmicron.c,v 1.6 2017/11/01 19:34:46 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_jmicron.c,v 1.7 2018/10/22 19:38:06 jdolecek Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: ata_raid_jmi
#include <sys/disk.h>
#include <sys/disklabel.h>
#include <sys/fcntl.h>
-#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/kauth.h>
@@ -130,7 +129,7 @@ ata_raid_read_config_jmicron(struct wd_s
int bmajor, error, count, disk, total_disks;
dev_t dev;
- info = malloc(sizeof(*info), M_DEVBUF, M_WAITOK|M_ZERO);
+ info = kmem_zalloc(sizeof(*info), KM_SLEEP);
bmajor = devsw_name2blk(dksc->sc_xname, NULL, 0);
@@ -265,6 +264,6 @@ ata_raid_read_config_jmicron(struct wd_s
error = 0;
out:
- free(info, M_DEVBUF);
+ kmem_free(info, sizeof(*info));
return error;
}
Index: src/sys/dev/ata/ata_raid_nvidia.c
diff -u src/sys/dev/ata/ata_raid_nvidia.c:1.3 src/sys/dev/ata/ata_raid_nvidia.c:1.4
--- src/sys/dev/ata/ata_raid_nvidia.c:1.3 Wed Nov 1 19:34:46 2017
+++ src/sys/dev/ata/ata_raid_nvidia.c Mon Oct 22 19:38:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid_nvidia.c,v 1.3 2017/11/01 19:34:46 mlelstv Exp $ */
+/* $NetBSD: ata_raid_nvidia.c,v 1.4 2018/10/22 19:38:06 jdolecek Exp $ */
/*-
* Copyright (c) 2000 - 2008 Søren Schmidt <s...@freebsd.org>
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_nvidia.c,v 1.3 2017/11/01 19:34:46 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_nvidia.c,v 1.4 2018/10/22 19:38:06 jdolecek Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: ata_raid_nvi
#include <sys/disk.h>
#include <sys/disklabel.h>
#include <sys/fcntl.h>
-#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/kauth.h>
@@ -136,7 +135,7 @@ ata_raid_read_config_nvidia(struct wd_so
struct _arrayno *next;
} arrayno = { 0, 0, NULL}, *anptr;
- info = malloc(sizeof(*info), M_DEVBUF, M_WAITOK);
+ info = kmem_zalloc(sizeof(*info), KM_SLEEP);
bmajor = devsw_name2blk(dksc->sc_xname, NULL, 0);
@@ -200,7 +199,7 @@ ata_raid_read_config_nvidia(struct wd_so
/* new array */
anptr->magic1 = info->magic_1;
anptr->magic2 = info->magic_2;
- anptr->next = malloc(sizeof(arrayno), M_DEVBUF, M_WAITOK);
+ anptr->next = kmem_zalloc(sizeof(arrayno), KM_SLEEP);
}
aai = ata_raid_get_array_info(ATA_RAID_TYPE_NVIDIA, count);
@@ -257,6 +256,6 @@ ata_raid_read_config_nvidia(struct wd_so
error = 0;
out:
- free(info, M_DEVBUF);
+ kmem_free(info, sizeof(*info));
return (error);
}
Index: src/sys/dev/ata/ata_raid_promise.c
diff -u src/sys/dev/ata/ata_raid_promise.c:1.12 src/sys/dev/ata/ata_raid_promise.c:1.13
--- src/sys/dev/ata/ata_raid_promise.c:1.12 Wed Nov 1 19:34:46 2017
+++ src/sys/dev/ata/ata_raid_promise.c Mon Oct 22 19:38:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid_promise.c,v 1.12 2017/11/01 19:34:46 mlelstv Exp $ */
+/* $NetBSD: ata_raid_promise.c,v 1.13 2018/10/22 19:38:06 jdolecek Exp $ */
/*-
* Copyright (c) 2000,2001,2002 Søren Schmidt <s...@freebsd.org>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_promise.c,v 1.12 2017/11/01 19:34:46 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_promise.c,v 1.13 2018/10/22 19:38:06 jdolecek Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: ata_raid_pro
#include <sys/disk.h>
#include <sys/disklabel.h>
#include <sys/fcntl.h>
-#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/kauth.h>
@@ -77,7 +76,7 @@ ata_raid_read_config_promise(struct wd_s
struct ataraid_array_info *aai;
struct ataraid_disk_info *adi;
- info = malloc(sizeof(*info), M_DEVBUF, M_WAITOK);
+ info = kmem_zalloc(sizeof(*info), KM_SLEEP);
bmajor = devsw_name2blk(dksc->sc_xname, NULL, 0);
@@ -208,6 +207,6 @@ ata_raid_read_config_promise(struct wd_s
error = 0;
out:
- free(info, M_DEVBUF);
+ kmem_free(info, sizeof(*info));
return (error);
}
