diff options
Diffstat (limited to 'modules/spl')
| -rw-r--r-- | modules/spl/spl-generic.c | 25 | ||||
| -rw-r--r-- | modules/spl/spl-kmem.c | 24 |
2 files changed, 30 insertions, 19 deletions
diff --git a/modules/spl/spl-generic.c b/modules/spl/spl-generic.c index 3faa4b6b3..8cd217cf1 100644 --- a/modules/spl/spl-generic.c +++ b/modules/spl/spl-generic.c @@ -10,7 +10,8 @@ /* * Generic support */ -static char spl_debug_buffer[MAXMSGLEN]; +static char spl_debug_buffer1[1024]; +static char spl_debug_buffer2[1024]; static spinlock_t spl_debug_lock = SPIN_LOCK_UNLOCKED; unsigned long spl_debug_mask = 0; @@ -83,12 +84,11 @@ EXPORT_SYMBOL(ddi_strtoul); void __dprintf(const char *file, const char *func, int line, const char *fmt, ...) { - char *sfp, *start, *ptr; + char *sfp; struct timeval tv; unsigned long flags; va_list ap; - start = ptr = spl_debug_buffer; sfp = strrchr(file, '/'); do_gettimeofday(&tv); @@ -98,18 +98,21 @@ __dprintf(const char *file, const char *func, int line, const char *fmt, ...) * reason why we really, really, need an internal debug log. */ spin_lock_irqsave(&spl_debug_lock, flags); - ptr += snprintf(ptr, MAXMSGLEN - 1, - "spl: %lu.%06lu:%d:%u:%s:%d:%s(): ", - tv.tv_sec, tv.tv_usec, current->pid, - smp_processor_id(), - sfp == NULL ? file : sfp + 1, - line, func); + memset(spl_debug_buffer1, 0, 1024); + memset(spl_debug_buffer2, 0, 1024); + + snprintf(spl_debug_buffer1, 1023, + "spl: %lu.%06lu:%d:%u:%s:%d:%s(): ", + tv.tv_sec, tv.tv_usec, current->pid, + smp_processor_id(), + sfp == NULL ? file : sfp + 1, + line, func); va_start(ap, fmt); - ptr += vsnprintf(ptr, MAXMSGLEN - (ptr - start) - 1, fmt, ap); + vsnprintf(spl_debug_buffer2, 1023, fmt, ap); va_end(ap); - printk("%s", start); + printk("%s%s", spl_debug_buffer1, spl_debug_buffer2); spin_unlock_irqrestore(&spl_debug_lock, flags); } EXPORT_SYMBOL(__dprintf); diff --git a/modules/spl/spl-kmem.c b/modules/spl/spl-kmem.c index 1b9eaafe6..7c88eda5f 100644 --- a/modules/spl/spl-kmem.c +++ b/modules/spl/spl-kmem.c @@ -50,7 +50,6 @@ typedef struct kmem_cache_cb { static spinlock_t kmem_cache_cb_lock = SPIN_LOCK_UNLOCKED; -//static spinlock_t kmem_cache_cb_lock = (spinlock_t) { 1 SPINLOCK_MAGIC_INIT }; static LIST_HEAD(kmem_cache_cb_list); static struct shrinker *kmem_cache_shrinker; @@ -110,17 +109,22 @@ static void kmem_cache_generic_constructor(void *ptr, kmem_cache_t *cache, unsigned long flags) { kmem_cache_cb_t *kcc; + kmem_constructor_t constructor; + void *private; spin_lock(&kmem_cache_cb_lock); /* Callback list must be in sync with linux slab caches */ kcc = kmem_cache_find_cache_cb(cache); BUG_ON(!kcc); - - if (kcc->kcc_constructor) - kcc->kcc_constructor(ptr, kcc->kcc_private, (int)flags); + constructor = kcc->kcc_constructor; + private = kcc->kcc_private; spin_unlock(&kmem_cache_cb_lock); + + if (constructor) + constructor(ptr, private, (int)flags); + /* Linux constructor has no return code, silently eat it */ } @@ -128,18 +132,22 @@ static void kmem_cache_generic_destructor(void *ptr, kmem_cache_t *cache, unsigned long flags) { kmem_cache_cb_t *kcc; + kmem_destructor_t destructor; + void *private; spin_lock(&kmem_cache_cb_lock); /* Callback list must be in sync with linux slab caches */ kcc = kmem_cache_find_cache_cb(cache); BUG_ON(!kcc); - - /* Solaris destructor takes no flags, silently eat them */ - if (kcc->kcc_destructor) - kcc->kcc_destructor(ptr, kcc->kcc_private); + destructor = kcc->kcc_destructor; + private = kcc->kcc_private; spin_unlock(&kmem_cache_cb_lock); + + /* Solaris destructor takes no flags, silently eat them */ + if (destructor) + destructor(ptr, private); } /* XXX - Arguments are ignored */ |