Commit c8a75afb authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen

Revert "scsi: target/iscsi: Reduce number of __iscsit_free_cmd() callers"

The cxgbit driver expects that __iscsit_free_cmd() is called before the
target core frees the command page list. Since this patch breaks the
cxgbit driver, revert it.
Reported-by: default avatarVarun Prakash <varun@chelsio.com>
Fixes: ed88f055 ("scsi: target/iscsi: Reduce number of __iscsit_free_cmd() callers")
Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Cc: Varun Prakash <varun@chelsio.com>
Cc: Mike Christie <mchristi@redhat.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Christoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMike Christie <mchristi@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 0e0d7526
...@@ -497,6 +497,8 @@ void iscsit_aborted_task(struct iscsi_conn *conn, struct iscsi_cmd *cmd) ...@@ -497,6 +497,8 @@ void iscsit_aborted_task(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
!(cmd->se_cmd.transport_state & CMD_T_FABRIC_STOP)) !(cmd->se_cmd.transport_state & CMD_T_FABRIC_STOP))
list_del_init(&cmd->i_conn_node); list_del_init(&cmd->i_conn_node);
spin_unlock_bh(&conn->cmd_lock); spin_unlock_bh(&conn->cmd_lock);
__iscsit_free_cmd(cmd, true);
} }
EXPORT_SYMBOL(iscsit_aborted_task); EXPORT_SYMBOL(iscsit_aborted_task);
......
...@@ -1544,7 +1544,6 @@ static void lio_release_cmd(struct se_cmd *se_cmd) ...@@ -1544,7 +1544,6 @@ static void lio_release_cmd(struct se_cmd *se_cmd)
struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd); struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd);
pr_debug("Entering lio_release_cmd for se_cmd: %p\n", se_cmd); pr_debug("Entering lio_release_cmd for se_cmd: %p\n", se_cmd);
__iscsit_free_cmd(cmd, true);
iscsit_release_cmd(cmd); iscsit_release_cmd(cmd);
} }
......
...@@ -772,8 +772,10 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown) ...@@ -772,8 +772,10 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown)
__iscsit_free_cmd(cmd, shutdown); __iscsit_free_cmd(cmd, shutdown);
if (se_cmd) { if (se_cmd) {
rc = transport_generic_free_cmd(se_cmd, shutdown); rc = transport_generic_free_cmd(se_cmd, shutdown);
if (!rc && shutdown && se_cmd->se_sess) if (!rc && shutdown && se_cmd->se_sess) {
__iscsit_free_cmd(cmd, shutdown);
target_put_sess_cmd(se_cmd); target_put_sess_cmd(se_cmd);
}
} else { } else {
iscsit_release_cmd(cmd); iscsit_release_cmd(cmd);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment