From 13fb40a3bac080f364de8741153b1e4d2dddfee4 Mon Sep 17 00:00:00 2001 From: isaac Date: Wed, 24 Jun 2009 16:51:55 +0000 Subject: [PATCH] i=wangdi,i=rread,b=19920: - LIBCFS_ALLOC_GFP should not print 'kmalloced' message at allocation failures. --- lnet/include/libcfs/kp30.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lnet/include/libcfs/kp30.h b/lnet/include/libcfs/kp30.h index 8b7249e..f4fdd5b 100644 --- a/lnet/include/libcfs/kp30.h +++ b/lnet/include/libcfs/kp30.h @@ -164,20 +164,20 @@ do { \ do { \ LASSERT(!in_interrupt() || \ (size <= LIBCFS_VMALLOC_SIZE && mask == CFS_ALLOC_ATOMIC));\ - if (unlikely((size) > LIBCFS_VMALLOC_SIZE)) \ + if (unlikely((size) > LIBCFS_VMALLOC_SIZE)) \ (ptr) = cfs_alloc_large(size); \ else \ (ptr) = cfs_alloc((size), (mask)); \ - if (unlikely((ptr) == NULL)) { \ + if (unlikely((ptr) == NULL)) { \ CERROR("LNET: out of memory at %s:%d (tried to alloc '" \ #ptr "' = %d)\n", __FILE__, __LINE__, (int)(size));\ CERROR("LNET: %d total bytes allocated by lnet\n", \ atomic_read(&libcfs_kmemory)); \ - } else { \ - libcfs_kmem_inc((ptr), (size)); \ - if (!((mask) & CFS_ALLOC_ZERO)) \ - memset((ptr), 0, (size)); \ + break; \ } \ + libcfs_kmem_inc((ptr), (size)); \ + if (!((mask) & CFS_ALLOC_ZERO)) \ + memset((ptr), 0, (size)); \ CDEBUG(D_MALLOC, "kmalloced '" #ptr "': %d at %p (tot %d).\n", \ (int)(size), (ptr), atomic_read (&libcfs_kmemory)); \ } while (0) -- 1.8.3.1