diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-08-24 19:27:57 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-08-24 19:27:57 +0800 |
| commit | 2d24df0e84490d49a5211468e8793ecf9ad8a5bb (patch) | |
| tree | f6ad5cf51e4369f66f221cea59bdbb575d060480 /drivers/target/iscsi/iscsi_target.c | |
| parent | 21b5f5d91a589931a22009d918fd319f481e8eee (diff) | |
| parent | 425fdd287e9b41a20bc8b47a00064da3fcd8cae4 (diff) | |
Merge tag 'v4.4.83' into linux-linaro-lsk-v4.4lsk-v4.4-17.08
This is the 4.4.83 stable release
Diffstat (limited to 'drivers/target/iscsi/iscsi_target.c')
| -rw-r--r-- | drivers/target/iscsi/iscsi_target.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 31d5d9c0e10b..1ff1c83e2df5 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c @@ -418,6 +418,7 @@ int iscsit_reset_np_thread( return 0; } np->np_thread_state = ISCSI_NP_THREAD_RESET; + atomic_inc(&np->np_reset_count); if (np->np_thread) { spin_unlock_bh(&np->np_thread_lock); @@ -1996,6 +1997,7 @@ iscsit_setup_text_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, cmd->cmd_sn = be32_to_cpu(hdr->cmdsn); cmd->exp_stat_sn = be32_to_cpu(hdr->exp_statsn); cmd->data_direction = DMA_NONE; + kfree(cmd->text_in_ptr); cmd->text_in_ptr = NULL; return 0; |