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
2020-05-19 15:18:48 -07:00
parent d51093caac 5ff1a5efb2
commit 46819e3964
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/include/backport.h
+9
View File
@@ -970,6 +970,15 @@ static inline void *kvzalloc(size_t size, gfp_t flags)
{
return kvmalloc(size, flags | __GFP_ZERO);
}
/*
* See also commit 752ade68cbd8 ("treewide: use kv[mz]alloc* rather than
* opencoded variants") # v4.12.
*/
static inline void *kvmalloc_array(size_t n, size_t size, gfp_t flags)
{
return kvmalloc(n * size, flags);
}
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) && \
srpt/src/ib_srpt.c
+12 -4
View File
@@ -1972,8 +1972,10 @@ srpt_handle_new_iu(struct srpt_rdma_ch *ch,
goto push;
}
if (!list_empty(&recv_ioctx->wait_list))
if (!list_empty(&recv_ioctx->wait_list)) {
WARN_ON_ONCE(!ch->processing_wait_list);
list_del_init(&recv_ioctx->wait_list);
}
switch (opcode) {
case SRP_CMD:
@@ -2006,8 +2008,10 @@ out:
return send_ioctx;
push:
if (list_empty(&recv_ioctx->wait_list))
if (list_empty(&recv_ioctx->wait_list)) {
WARN_ON_ONCE(ch->processing_wait_list);
list_add_tail(&recv_ioctx->wait_list, &ch->cmd_wait_list);
}
goto out;
}
@@ -2046,14 +2050,18 @@ static void srpt_process_wait_list(struct srpt_rdma_ch *ch)
{
struct srpt_recv_ioctx *recv_ioctx, *tmp;
ch->processing_wait_list = true;
WARN_ON_ONCE(ch->state == CH_CONNECTING);
if (list_empty(&ch->cmd_wait_list))
return;
WARN_ON_ONCE(ch->processing_wait_list);
ch->processing_wait_list = true;
list_for_each_entry_safe(recv_ioctx, tmp, &ch->cmd_wait_list,
wait_list) {
if (!srpt_handle_new_iu(ch, recv_ioctx, srpt_new_iu_context))
break;
}
ch->processing_wait_list = false;
}