]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
iscsi-target: Return error if unable to add network portal
authorVarun Prakash <varun@chelsio.com>
Sun, 11 Dec 2016 16:35:56 +0000 (22:05 +0530)
committerBart Van Assche <bart.vanassche@sandisk.com>
Fri, 16 Dec 2016 10:16:15 +0000 (11:16 +0100)
If iscsit_tpg_add_network_portal() fails then
return error code instead of 0 to user space.

If iscsi-target returns 0 then user space keeps
on retrying same command infinitely, targetcli or
echo hangs till command completes with non zero
return value. In some cases it is possible that
add network portal command never completes with
success even after retrying multiple times,
for example - cxgbit_setup_np() always returns
-EINVAL if portal IP does not belong to Chelsio
adapter interface.

Signed-off-by: Varun Prakash <varun@chelsio.com>
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
[ bvanassche: Added "Fixes:" and "Cc: stable" tags ]
Fixes: commit d4b3fa4b0881 ("iscsi-target: Make iscsi_tpg_np driver show/store use generic code")
Cc: <stable@vger.kernel.org>
drivers/target/iscsi/iscsi_target_configfs.c

index 7bfb16d407b99b254ca981d8be8e13a5f28a41e0..bf40f03755ddc50697652ccde864d40df840fa0b 100644 (file)
@@ -101,8 +101,10 @@ static ssize_t lio_target_np_driver_store(struct config_item *item,
 
                tpg_np_new = iscsit_tpg_add_network_portal(tpg,
                                        &np->np_sockaddr, tpg_np, type);
-               if (IS_ERR(tpg_np_new))
+               if (IS_ERR(tpg_np_new)) {
+                       rc = PTR_ERR(tpg_np_new);
                        goto out;
+               }
        } else {
                tpg_np_new = iscsit_tpg_locate_child_np(tpg_np, type);
                if (tpg_np_new) {