| From 0583c261e6325f392c1f7a1b9112e31298e1a4bd Mon Sep 17 00:00:00 2001 |
| From: Nicholas Bellinger <nab@linux-iscsi.org> |
| Date: Mon, 31 Oct 2016 00:54:40 -0700 |
| Subject: target: Use correct SCSI status during EXTENDED_COPY exception |
| |
| From: Nicholas Bellinger <nab@linux-iscsi.org> |
| |
| commit 0583c261e6325f392c1f7a1b9112e31298e1a4bd upstream. |
| |
| This patch adds the missing target_complete_cmd() SCSI status |
| parameter change in target_xcopy_do_work(), that was originally |
| missing in commit 926317de33. |
| |
| It correctly propigates up the correct SCSI status during |
| EXTENDED_COPY exception cases, instead of always using the |
| hardcoded SAM_STAT_CHECK_CONDITION from original code. |
| |
| This is required for ESX host environments that expect to |
| hit SAM_STAT_RESERVATION_CONFLICT for certain scenarios, |
| and SAM_STAT_CHECK_CONDITION results in non-retriable |
| status for these cases. |
| |
| Reported-by: Nixon Vincent <nixon.vincent@calsoftinc.com> |
| Tested-by: Nixon Vincent <nixon.vincent@calsoftinc.com> |
| Cc: Nixon Vincent <nixon.vincent@calsoftinc.com> |
| Reviewed-by: Christoph Hellwig <hch@lst.de> |
| Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/target/target_core_xcopy.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/target/target_core_xcopy.c |
| +++ b/drivers/target/target_core_xcopy.c |
| @@ -836,7 +836,7 @@ out: |
| " CHECK_CONDITION -> sending response\n", rc); |
| ec_cmd->scsi_status = SAM_STAT_CHECK_CONDITION; |
| } |
| - target_complete_cmd(ec_cmd, SAM_STAT_CHECK_CONDITION); |
| + target_complete_cmd(ec_cmd, ec_cmd->scsi_status); |
| } |
| |
| sense_reason_t target_do_xcopy(struct se_cmd *se_cmd) |
