redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

target/iscsi: Fix op=disable + error handling cases in np_store_iser

Browse source 
Writing 0 when iser was not previously enabled, so succeed but do
nothing so that user-space code doesn't need a try: catch block
when ib_isert logic is not available.

Also, return actual error from add_network_portal using PTR_ERR
during op=enable failure.

Signed-off-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Andy Grover 2013-05-29 12:05:59 -07:00 committed by Nicholas Bellinger
parent b5aff3d274
commit 58bd0c69ff
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/target/iscsi/iscsi_target_configfs.c
View file

@ -155,7 +155,7 @@ static ssize_t lio_target_np_store_iser(
struct iscsi_tpg_np *tpg_np_iser = NULL; struct iscsi_tpg_np *tpg_np_iser = NULL;
char *endptr; char *endptr;
u32 op; u32 op;
int rc; int rc = 0;
op = simple_strtoul(page, &endptr, 0); op = simple_strtoul(page, &endptr, 0);
if ((op != 1) && (op != 0)) { if ((op != 1) && (op != 0)) {
@ -174,22 +174,25 @@ static ssize_t lio_target_np_store_iser(
return -EINVAL; return -EINVAL;
if (op) { if (op) {
int rc = request_module("ib_isert"); rc = request_module("ib_isert");
if (rc != 0) if (rc != 0) {
pr_warn("Unable to request_module for ib_isert\n"); pr_warn("Unable to request_module for ib_isert\n");
rc = 0;
}
tpg_np_iser = iscsit_tpg_add_network_portal(tpg, &np->np_sockaddr, tpg_np_iser = iscsit_tpg_add_network_portal(tpg, &np->np_sockaddr,
np->np_ip, tpg_np, ISCSI_INFINIBAND); np->np_ip, tpg_np, ISCSI_INFINIBAND);
if (!tpg_np_iser || IS_ERR(tpg_np_iser)) if (IS_ERR(tpg_np_iser)) {
rc = PTR_ERR(tpg_np_iser);
goto out; goto out;
}
} else { } else {
tpg_np_iser = iscsit_tpg_locate_child_np(tpg_np, ISCSI_INFINIBAND); tpg_np_iser = iscsit_tpg_locate_child_np(tpg_np, ISCSI_INFINIBAND);
if (!tpg_np_iser) if (tpg_np_iser) {
goto out; rc = iscsit_tpg_del_network_portal(tpg, tpg_np_iser);
if (rc < 0)
rc = iscsit_tpg_del_network_portal(tpg, tpg_np_iser); goto out;
if (rc < 0) }
goto out;
} }
printk("lio_target_np_store_iser() done, op: %d\n", op); printk("lio_target_np_store_iser() done, op: %d\n", op);
@ -198,7 +201,7 @@ static ssize_t lio_target_np_store_iser(
return count; return count;
out: out:
iscsit_put_tpg(tpg); iscsit_put_tpg(tpg);
return -EINVAL; return rc;
} }
TF_NP_BASE_ATTR(lio_target, iser, S_IRUGO | S_IWUSR); TF_NP_BASE_ATTR(lio_target, iser, S_IRUGO | S_IWUSR);