diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-08-24 19:28:38 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-08-24 19:28:38 +0800 |
| commit | 7c6819fafcd4d26f655ad9b0441f79773c69cf99 (patch) | |
| tree | f1345c2c196f58257d1f338b9f2752f470c44923 /drivers/target/iscsi/iscsi_target.c | |
| parent | 5d296e2cec6ebbb062829078ffcd36a205c9b293 (diff) | |
| parent | a97a16f18c4895e41951a44d27af8af0b8f1d897 (diff) | |
Merge tag 'v4.9.44' into linux-linaro-lsk-v4.9lsk-v4.9-17.08
This is the 4.9.44 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 155fe0e0623f..e49fcd5e61f7 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); @@ -2177,6 +2178,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; |