Commit 7c78b8de authored by Roland Dreier's avatar Roland Dreier Committed by Nicholas Bellinger

sbp-target: Consolidate duplicated error path code in sbp_handle_command()

Cc: Chris Boot <bootc@bootc.net>
Cc: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 669ab62c
...@@ -1219,28 +1219,14 @@ static void sbp_handle_command(struct sbp_target_request *req) ...@@ -1219,28 +1219,14 @@ static void sbp_handle_command(struct sbp_target_request *req)
ret = sbp_fetch_command(req); ret = sbp_fetch_command(req);
if (ret) { if (ret) {
pr_debug("sbp_handle_command: fetch command failed: %d\n", ret); pr_debug("sbp_handle_command: fetch command failed: %d\n", ret);
req->status.status |= cpu_to_be32( goto err;
STATUS_BLOCK_RESP(STATUS_RESP_TRANSPORT_FAILURE) |
STATUS_BLOCK_DEAD(0) |
STATUS_BLOCK_LEN(1) |
STATUS_BLOCK_SBP_STATUS(SBP_STATUS_UNSPECIFIED_ERROR));
sbp_send_status(req);
sbp_free_request(req);
return;
} }
ret = sbp_fetch_page_table(req); ret = sbp_fetch_page_table(req);
if (ret) { if (ret) {
pr_debug("sbp_handle_command: fetch page table failed: %d\n", pr_debug("sbp_handle_command: fetch page table failed: %d\n",
ret); ret);
req->status.status |= cpu_to_be32( goto err;
STATUS_BLOCK_RESP(STATUS_RESP_TRANSPORT_FAILURE) |
STATUS_BLOCK_DEAD(0) |
STATUS_BLOCK_LEN(1) |
STATUS_BLOCK_SBP_STATUS(SBP_STATUS_UNSPECIFIED_ERROR));
sbp_send_status(req);
sbp_free_request(req);
return;
} }
unpacked_lun = req->login->lun->unpacked_lun; unpacked_lun = req->login->lun->unpacked_lun;
...@@ -1252,6 +1238,16 @@ static void sbp_handle_command(struct sbp_target_request *req) ...@@ -1252,6 +1238,16 @@ static void sbp_handle_command(struct sbp_target_request *req)
target_submit_cmd(&req->se_cmd, sess->se_sess, req->cmd_buf, target_submit_cmd(&req->se_cmd, sess->se_sess, req->cmd_buf,
req->sense_buf, unpacked_lun, data_length, req->sense_buf, unpacked_lun, data_length,
MSG_SIMPLE_TAG, data_dir, 0); MSG_SIMPLE_TAG, data_dir, 0);
return;
err:
req->status.status |= cpu_to_be32(
STATUS_BLOCK_RESP(STATUS_RESP_TRANSPORT_FAILURE) |
STATUS_BLOCK_DEAD(0) |
STATUS_BLOCK_LEN(1) |
STATUS_BLOCK_SBP_STATUS(SBP_STATUS_UNSPECIFIED_ERROR));
sbp_send_status(req);
sbp_free_request(req);
} }
/* /*
......
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