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
This commit is contained in:
Bart Van Assche
2018-11-04 04:14:34 +00:00
parent 99a47183dc
commit 26ff486adf

View File

@@ -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;
}