mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-19 21:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2018-07-21 09:46:38 -07:00
parent 4625ceed20 687c55143d
commit 5008ad00d0
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iscsi-scst/kernel/isert-scst/iser_global.c
+4 -2
View File
@@ -144,8 +144,10 @@ int isert_global_init(void)
return -ENOMEM;
}
isert_cmnd_cache = KMEM_CACHE_USERCOPY(isert_cmnd,
SCST_SLAB_FLAGS|SLAB_HWCACHE_ALIGN);
isert_cmnd_cache = kmem_cache_create_usercopy("isert_cmnd",
sizeof(struct isert_cmnd), __alignof__(struct isert_cmnd),
SCST_SLAB_FLAGS | SLAB_HWCACHE_ALIGN,
0, sizeof(struct isert_cmnd), NULL);
if (!isert_cmnd_cache) {
destroy_workqueue(isert_glob.conn_wq);
PRINT_ERROR("Failed to alloc iser command cache");
scst/include/backport.h
+2 -2
View File
@@ -680,7 +680,7 @@ static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
static inline struct kmem_cache *kmem_cache_create_usercopy(const char *name,
unsigned int size, unsigned int align,
slab_flags_t flags,
unsigned long flags,
unsigned int useroffset, unsigned int usersize,
void (*ctor)(void *))
{
@@ -689,7 +689,7 @@ static inline struct kmem_cache *kmem_cache_create_usercopy(const char *name,
#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
static inline struct kmem_cache *kmem_cache_create_usercopy(const char *name,
unsigned int size, unsigned int align,
slab_flags_t flags,
unsigned long flags,
unsigned int useroffset, unsigned int usersize,
void (*ctor)(void *))
{