Merge of the missed commits r3447,3452,3458 from the trunk.

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.1.0.x@3559 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2011-06-08 21:27:00 +00:00
parent 593a7b0fe3
commit fa37fa3f1b
4 changed files with 52 additions and 22 deletions
+4 -4
View File
@@ -4047,10 +4047,10 @@ static int __init iscsi_init(void)
iscsi_cmnd_abort_mempool = mempool_create_kmalloc_pool(2500,
sizeof(struct iscsi_cmnd_abort_params));
if (iscsi_cmnd_abort_mempool == NULL) {
err = -ENOMEM;
goto out_free_dummy;
}
if (iscsi_cmnd_abort_mempool == NULL) {
err = -ENOMEM;
goto out_free_dummy;
}
#if defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION)
err = net_set_get_put_page_callbacks(iscsi_get_page_callback,