mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-22 05:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2017-05-24 20:59:12 -07:00
parent d411309fef e5e4531049
commit 9a92ba306d
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iscsi-scst/kernel/nthread.c
View File

@@ -1695,7 +1695,7 @@ static int tx_padding(struct iscsi_cmnd *cmnd, int state)
TRACE_DBG("Sending %d padding bytes (cmd %p)", rest, cmnd);
iov.iov_base = (char *)(&padding) + (sizeof(uint32_t) - rest);
iov.iov_base = (char *)&padding;
iov.iov_len = rest;
res = kernel_sendmsg(cmnd->conn->sock, &msg, &iov, 1, rest);

7
scst/src/scst_mem.c
View File

@@ -1649,7 +1649,12 @@ struct sgv_pool *sgv_pool_create_node(const char *name,
}
}
pool = kmem_cache_alloc_node(sgv_pool_cachep, GFP_KERNEL, nodeid);
/*
* __sgv_shrink() takes sgv_pools_mutex, so, to prevent deadlock with it
* if this allocation will try to reclaim memory, GFP_NOFS has to be used
* here.
*/
pool = kmem_cache_alloc_node(sgv_pool_cachep, GFP_KERNEL|GFP_NOFS, nodeid);
if (pool == NULL) {
PRINT_ERROR("Allocation of sgv_pool failed (size %zd)",
sizeof(*pool));