From 26ff486adf50574e2f0761bfb77d8b1977786aab Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 04:14:34 +0000 Subject: [PATCH] Merge r7428 from trunk git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7681 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_mem.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/scst/src/scst_mem.c b/scst/src/scst_mem.c index f6f2b924a..4070a0c85 100644 --- a/scst/src/scst_mem.c +++ b/scst/src/scst_mem.c @@ -1374,15 +1374,10 @@ static void sgv_pool_init_cache(struct sgv_pool *pool, int cache_num, scnprintf(pool->cache_names[cache_num], sizeof(pool->cache_names[cache_num]), "%s-%uK", pool->name, (pages << PAGE_SHIFT) >> 10); - pool->caches[cache_num] = kmem_cache_create( - pool->cache_names[cache_num], size, - 0, per_cpu ? SCST_SLAB_FLAGS : - (SCST_SLAB_FLAGS|SLAB_HWCACHE_ALIGN), NULL -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)) - , NULL); -#else - ); -#endif + pool->caches[cache_num] = kmem_cache_create_usercopy( + pool->cache_names[cache_num], size, 0/*align*/, per_cpu ? + SCST_SLAB_FLAGS : SCST_SLAB_FLAGS | SLAB_HWCACHE_ALIGN, + 0/*useroffset*/, size/*usersize*/, NULL); return; }