From f31c239da1955f8c51b90f1ab76b5508d6f56352 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sun, 13 Apr 2003 00:23:42 +0000 Subject: [PATCH] Eliminate unnecessary gotos from kmem_malloc(). --- sys/vm/vm_kern.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 16686c9fdc87..e7bf945daf06 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -333,12 +333,12 @@ kmem_malloc(map, size, flags) printf("Out of mbuf address space!\n"); printf("Consider increasing NMBCLUSTERS\n"); } - goto bad; + return (0); } if ((flags & M_NOWAIT) == 0) panic("kmem_malloc(%ld): kmem_map too small: %ld total allocated", (long)size, (long)map->size); - goto bad; + return (0); } offset = addr - VM_MIN_KERNEL_ADDRESS; vm_object_reference(kmem_object); @@ -399,7 +399,7 @@ retry: vm_object_unlock(kmem_object); vm_map_delete(map, addr, addr + size); vm_map_unlock(map); - goto bad; + return (0); } if (flags & M_ZERO && (m->flags & PG_ZERO) == 0) pmap_zero_page(m); @@ -445,9 +445,6 @@ retry: vm_map_unlock(map); return (addr); - -bad: - return (0); } /*