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

Merge r6014 from 3.0.x-iser branch

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6258 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2015-06-11 15:47:28 +00:00
parent 26891b58bd
commit 8aa1081442
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
iscsi-scst/kernel/isert-scst/iser_datamover.c
View File

@@ -92,12 +92,7 @@ out:
void *isert_portal_add(struct sockaddr *saddr, size_t addr_len)
{
struct isert_portal *portal = isert_portal_start(saddr, addr_len);
if (IS_ERR(portal))
portal = NULL;
return portal;
return isert_portal_start(saddr, addr_len);
}
int isert_portal_remove(void *portal_h)

4
iscsi-scst/kernel/isert-scst/isert_login.c
View File

@@ -410,10 +410,10 @@ static long isert_listen_ioctl(struct file *filp, unsigned int cmd,
portal = isert_portal_add((struct sockaddr *)&dev->info.addr,
dev->info.addr_len);
if (!portal) {
if (IS_ERR(portal)) {
PRINT_ERROR("Unable to add portal of size %zu\n",
dev->info.addr_len);
res = -EINVAL;
res = PTR_ERR(portal);
goto out;
}
dev->portal_h[dev->free_portal_idx++] = portal;