From f0501c7c9fc2dd0146b1e64991a54d7f4532fd06 Mon Sep 17 00:00:00 2001 From: pschwan Date: Tue, 12 Nov 2002 02:13:34 +0000 Subject: [PATCH] back out vmalloc changes; there's not enough vmalloc space on MCR for the buffers that we require at startup, if you can believe that --- lustre/include/linux/obd_support.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h index d18341f..a6eb4c2 100644 --- a/lustre/include/linux/obd_support.h +++ b/lustre/include/linux/obd_support.h @@ -150,15 +150,10 @@ static inline void OBD_FAIL_WRITE(int id, kdev_t dev) } } -#define OBD_VMALLOC_SIZE 16384 - #define OBD_ALLOC(ptr, size) \ do { \ long s = (size); \ - if (s > OBD_VMALLOC_SIZE) \ - (ptr) = vmalloc(s); \ - else \ - (ptr) = kmalloc(s, GFP_KERNEL); \ + (ptr) = kmalloc(s, GFP_KERNEL); \ if ((ptr) == NULL) { \ CERROR("kmalloc of '" #ptr "' (%ld bytes) failed " \ "at %s:%d\n", s, __FILE__, __LINE__); \ @@ -174,10 +169,7 @@ do { \ do { \ int s = (size); \ LASSERT(ptr); \ - if (s > OBD_VMALLOC_SIZE) \ - vfree(ptr); \ - else \ - kfree(ptr); \ + kfree((ptr)); \ obd_memory -= s; \ CDEBUG(D_MALLOC, "kfreed '" #ptr "': %d at %p (tot %ld).\n", \ s, (ptr), obd_memory); \ -- 1.8.3.1