diff options
author | Jeff Roberson <jeff@FreeBSD.org> | 2002-03-20 10:17:00 +0000 |
---|---|---|
committer | Jeff Roberson <jeff@FreeBSD.org> | 2002-03-20 10:17:00 +0000 |
commit | 2684b6af7ac0566145e4da6ba77273b1e7d42166 (patch) | |
tree | 755fd7bc8fb7b181af7e8ffa4ce1f8549fb903d8 | |
parent | 070adb702240466b0eed261c4050e7c4dbdf312f (diff) | |
download | src-2684b6af7ac0566145e4da6ba77273b1e7d42166.tar.gz src-2684b6af7ac0566145e4da6ba77273b1e7d42166.zip |
Remove references to vm_zone.h and switch over to the new uma API.
Notes
Notes:
svn path=/head/; revision=92785
-rw-r--r-- | sys/fs/cd9660/cd9660_vnops.c | 8 | ||||
-rw-r--r-- | sys/isofs/cd9660/cd9660_vnops.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index 1a7d185ccf2c..52909b141b32 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -55,8 +55,8 @@ #include <sys/filio.h> #include <vm/vm.h> -#include <vm/vm_zone.h> #include <vm/vnode_pager.h> +#include <vm/uma.h> #include <isofs/cd9660/iso.h> #include <isofs/cd9660/cd9660_node.h> @@ -664,14 +664,14 @@ cd9660_readlink(ap) if (uio->uio_segflg == UIO_SYSSPACE) symname = uio->uio_iov->iov_base; else - symname = zalloc(namei_zone); + symname = uma_zalloc(namei_zone, M_WAITOK); /* * Ok, we just gathering a symbolic name in SL record. */ if (cd9660_rrip_getsymname(dirp, symname, &symlen, imp) == 0) { if (uio->uio_segflg != UIO_SYSSPACE) - zfree(namei_zone, symname); + uma_zfree(namei_zone, symname); brelse(bp); return (EINVAL); } @@ -685,7 +685,7 @@ cd9660_readlink(ap) */ if (uio->uio_segflg != UIO_SYSSPACE) { error = uiomove(symname, symlen, uio); - zfree(namei_zone, symname); + uma_zfree(namei_zone, symname); return (error); } uio->uio_resid -= symlen; diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c index 1a7d185ccf2c..52909b141b32 100644 --- a/sys/isofs/cd9660/cd9660_vnops.c +++ b/sys/isofs/cd9660/cd9660_vnops.c @@ -55,8 +55,8 @@ #include <sys/filio.h> #include <vm/vm.h> -#include <vm/vm_zone.h> #include <vm/vnode_pager.h> +#include <vm/uma.h> #include <isofs/cd9660/iso.h> #include <isofs/cd9660/cd9660_node.h> @@ -664,14 +664,14 @@ cd9660_readlink(ap) if (uio->uio_segflg == UIO_SYSSPACE) symname = uio->uio_iov->iov_base; else - symname = zalloc(namei_zone); + symname = uma_zalloc(namei_zone, M_WAITOK); /* * Ok, we just gathering a symbolic name in SL record. */ if (cd9660_rrip_getsymname(dirp, symname, &symlen, imp) == 0) { if (uio->uio_segflg != UIO_SYSSPACE) - zfree(namei_zone, symname); + uma_zfree(namei_zone, symname); brelse(bp); return (EINVAL); } @@ -685,7 +685,7 @@ cd9660_readlink(ap) */ if (uio->uio_segflg != UIO_SYSSPACE) { error = uiomove(symname, symlen, uio); - zfree(namei_zone, symname); + uma_zfree(namei_zone, symname); return (error); } uio->uio_resid -= symlen; |