From 197a59fce068afc4c472a9c8a8f9577010dca92c Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 19 Oct 2006 19:00:47 +0000 Subject: [PATCH] Adjust stuff to the renaming of free to kfree and realloc to krealloc also. --- share/man/man9/VOP_CREATE.9 | 8 ++++---- share/man/man9/VOP_LINK.9 | 4 ++-- share/man/man9/devclass_get_devices.9 | 4 ++-- share/man/man9/device_get_children.9 | 4 ++-- sys/dev/disk/sbp/sbp.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/share/man/man9/VOP_CREATE.9 b/share/man/man9/VOP_CREATE.9 index 99eac3aee5..5f828940b5 100644 --- a/share/man/man9/VOP_CREATE.9 +++ b/share/man/man9/VOP_CREATE.9 @@ -25,7 +25,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man9/VOP_CREATE.9,v 1.9.2.1 2001/12/17 11:30:18 ru Exp $ -.\" $DragonFly: src/share/man/man9/VOP_CREATE.9,v 1.5 2006/02/17 19:37:10 swildner Exp $ +.\" $DragonFly: src/share/man/man9/VOP_CREATE.9,v 1.6 2006/10/19 19:00:47 swildner Exp $ .\" .Dd July 24, 1996 .Os @@ -111,7 +111,7 @@ vop_create(struct vnode *dvp, error = SOMEFS_VALLOC(dvp, mode, cnp->cn_cred, &vp); if (error) { - free(cnp->cn_pnbuf, M_NAMEI); + kfree(cnp->cn_pnbuf, M_NAMEI); vput(dvp); return error; } @@ -139,7 +139,7 @@ vop_create(struct vnode *dvp, goto bad; if ((cnp->cn_flags & SAVESTART) == 0) - free(cnp->cn_pnbuf, M_NAMEI); + kfree(cnp->cn_pnbuf, M_NAMEI); vput(dvp); *vpp = vp; @@ -150,7 +150,7 @@ bad: * Write error occurred trying to update the inode * or the directory so must deallocate the inode. */ - free(cnp->cn_pnbuf, M_NAMEI); + kfree(cnp->cn_pnbuf, M_NAMEI); vput(vp); /* diff --git a/share/man/man9/VOP_LINK.9 b/share/man/man9/VOP_LINK.9 index 950bcabdfd..c7073294fe 100644 --- a/share/man/man9/VOP_LINK.9 +++ b/share/man/man9/VOP_LINK.9 @@ -25,7 +25,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man9/VOP_LINK.9,v 1.9.2.3 2001/12/17 11:30:18 ru Exp $ -.\" $DragonFly: src/share/man/man9/VOP_LINK.9,v 1.4 2004/06/01 11:36:53 hmp Exp $ +.\" $DragonFly: src/share/man/man9/VOP_LINK.9,v 1.5 2006/10/19 19:00:47 swildner Exp $ .\" .Dd July 24, 1996 .Os @@ -111,7 +111,7 @@ vop_link(struct vnode *dvp, struct vnode *vp, struct componentname *cnp) ...; } - free(cnp->cn_pnbuf, M_NAMEI); + kfree(cnp->cn_pnbuf, M_NAMEI); out1: if (vp != dvp) VOP_UNLOCK(vp); diff --git a/share/man/man9/devclass_get_devices.9 b/share/man/man9/devclass_get_devices.9 index 53fc965246..9b95808b2b 100644 --- a/share/man/man9/devclass_get_devices.9 +++ b/share/man/man9/devclass_get_devices.9 @@ -25,7 +25,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man9/devclass_get_devices.9,v 1.4.2.3 2001/12/17 11:30:18 ru Exp $ -.\" $DragonFly: src/share/man/man9/devclass_get_devices.9,v 1.3 2004/06/01 11:36:53 hmp Exp $ +.\" $DragonFly: src/share/man/man9/devclass_get_devices.9,v 1.4 2006/10/19 19:00:47 swildner Exp $ .\" .Dd June 16, 1998 .Dt DEVCLASS_GET_DEVICES 9 @@ -45,7 +45,7 @@ return the list in and the count in .Fa *devcountp . The memory allocated for the list should be freed using -.Fn free "*devlistp" "M_TEMP" . +.Fn kfree "*devlistp" "M_TEMP" . .Sh RETURN VALUES Zero is returned on success, otherwise an appropriate error is returned. .Sh SEE ALSO diff --git a/share/man/man9/device_get_children.9 b/share/man/man9/device_get_children.9 index 67ba79dcbe..83aaba9098 100644 --- a/share/man/man9/device_get_children.9 +++ b/share/man/man9/device_get_children.9 @@ -25,7 +25,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man9/device_get_children.9,v 1.1.2.3 2001/12/17 11:30:18 ru Exp $ -.\" $DragonFly: src/share/man/man9/device_get_children.9,v 1.3 2004/06/01 11:36:53 hmp Exp $ +.\" $DragonFly: src/share/man/man9/device_get_children.9,v 1.4 2006/10/19 19:00:47 swildner Exp $ .\" .Dd December 1, 1999 .Dt DEVICE_GET_CHILDREN 9 @@ -46,7 +46,7 @@ and return the list in and the count in .Fa *devcountp . The memory allocated for the list should be freed using -.Fn free "*devlistp" "M_TEMP" . +.Fn kfree "*devlistp" "M_TEMP" . .Sh RETURN VALUES Zero is returned on success, otherwise an appropriate error is returned. .Sh SEE ALSO diff --git a/sys/dev/disk/sbp/sbp.c b/sys/dev/disk/sbp/sbp.c index e82658d556..b72fa30506 100644 --- a/sys/dev/disk/sbp/sbp.c +++ b/sys/dev/disk/sbp/sbp.c @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.74 2004/01/08 14:58:09 simokawa Exp $ - * $DragonFly: src/sys/dev/disk/sbp/sbp.c,v 1.18 2006/09/05 03:48:10 dillon Exp $ + * $DragonFly: src/sys/dev/disk/sbp/sbp.c,v 1.19 2006/10/19 19:00:47 swildner Exp $ * */ @@ -468,7 +468,7 @@ END_DEBUG /* Reallocate */ if (maxlun != target->num_lun) { /* - * note: realloc() does not support M_ZERO. We must zero + * note: krealloc() does not support M_ZERO. We must zero * the extended region manually. */ newluns = krealloc(target->luns, -- 2.41.0