From f78a933f8ad5fa39c8af08d4ff792a387b906baf Mon Sep 17 00:00:00 2001 From: behlendo Date: Tue, 1 Jul 2008 04:06:09 +0000 Subject: [PATCH] Two easy fixes I caught with debug enabled git-svn-id: https://outreach.scidac.gov/svn/spl/trunk@143 7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c --- modules/spl/spl-kmem.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/spl/spl-kmem.c b/modules/spl/spl-kmem.c index 3be038d..fc238a3 100644 --- a/modules/spl/spl-kmem.c +++ b/modules/spl/spl-kmem.c @@ -619,8 +619,8 @@ spl_cache_grow(spl_kmem_cache_t *skc, int flags) if (flags & __GFP_WAIT) { flags |= __GFP_NOFAIL; - might_sleep(); local_irq_enable(); + might_sleep(); } sks = spl_slab_alloc(skc, flags); @@ -1006,7 +1006,7 @@ spl_kmem_init(void) spl_kmem_cache_shrinker = set_shrinker(KMC_DEFAULT_SEEKS, spl_kmem_cache_generic_shrinker); if (spl_kmem_cache_shrinker == NULL) - GOTO(out, rc = -ENOMEM); + RETURN(rc = -ENOMEM); #else register_shrinker(&spl_kmem_cache_shrinker); #endif @@ -1018,7 +1018,6 @@ spl_kmem_init(void) spl_kmem_init_tracking(&kmem_list, &kmem_lock, KMEM_TABLE_SIZE); spl_kmem_init_tracking(&vmem_list, &vmem_lock, VMEM_TABLE_SIZE); #endif -out: RETURN(rc); } -- 2.39.5