mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 22:37:45 -04:00
target: Add compare_and_write_post() completion callback fall through
This patch changes target_complete_ok_work() to fall through after calling the se_cmd->transport_complete_callback() -> compare_and_write_post() callback, by keying off the existance of SCF_COMPARE_AND_WRITE_POST. This is necessary because once SCF_COMPARE_AND_WRITE_POST has been set by compare_and_write_post(), the SCSI response needs to be sent via TFO->queue_status(). Cc: Christoph Hellwig <[email protected]> Cc: Hannes Reinecke <[email protected]> Cc: Martin Petersen <[email protected]> Cc: Chris Mason <[email protected]> Cc: James Bottomley <[email protected]> Cc: Nicholas Bellinger <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]>
This commit is contained in:
1 parent
68ff9b9b27
commit
a289008749
2 files changed
+12
-10
No files matched your search
@@ -375,7 +375,8 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd)
|
||||
buf = kzalloc(cmd->data_length, GFP_KERNEL);
|
||||
if (!buf) {
|
||||
pr_err("Unable to allocate compare_and_write buf\n");
|
||||
return TCM_OUT_OF_RESOURCES;
|
||||
ret = TCM_OUT_OF_RESOURCES;
|
||||
goto out;
|
||||
}
|
||||
|
||||
write_sg = kzalloc(sizeof(struct scatterlist) * cmd->t_data_nents,
|
||||
|
||||
@@ -1909,17 +1909,18 @@ static void target_complete_ok_work(struct work_struct *work)
|
||||
sense_reason_t rc;
|
||||
|
||||
rc = cmd->transport_complete_callback(cmd);
|
||||
if (!rc)
|
||||
if (!rc && !(cmd->se_cmd_flags & SCF_COMPARE_AND_WRITE_POST)) {
|
||||
return;
|
||||
} else if (rc) {
|
||||
ret = transport_send_check_condition_and_sense(cmd,
|
||||
rc, 0);
|
||||
if (ret == -EAGAIN || ret == -ENOMEM)
|
||||
goto queue_full;
|
||||
|
||||
ret = transport_send_check_condition_and_sense(cmd,
|
||||
rc, 0);
|
||||
if (ret == -EAGAIN || ret == -ENOMEM)
|
||||
goto queue_full;
|
||||
|
||||
transport_lun_remove_cmd(cmd);
|
||||
transport_cmd_check_stop_to_fabric(cmd);
|
||||
return;
|
||||
transport_lun_remove_cmd(cmd);
|
||||
transport_cmd_check_stop_to_fabric(cmd);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
switch (cmd->data_direction) {
|
||||
|
||||
Reference in new issue
Block a user