mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
sbp-target: Convert to TARGET_SCF_ACK_KREF I/O krefs
This patch converts sbp-target to modern TARGET_SCF_ACK_KREF usage for sbp_send_status() callback path, and drops the now obsolete sbp_free_request() failure path calls. Acked-by: Chris Boot <bootc@bootc.net> Tested-by: Chris Boot <bootc@bootc.net> Cc: Christoph Hellwig <hch@lst.de> Cc: Hannes Reinecke <hare@suse.de> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
parent
5a3ee221b5
commit
5f27edad95
1 changed files with 16 additions and 14 deletions
|
@ -893,7 +893,6 @@ static void tgt_agent_process_work(struct work_struct *work)
|
||||||
STATUS_BLOCK_SBP_STATUS(
|
STATUS_BLOCK_SBP_STATUS(
|
||||||
SBP_STATUS_REQ_TYPE_NOTSUPP));
|
SBP_STATUS_REQ_TYPE_NOTSUPP));
|
||||||
sbp_send_status(req);
|
sbp_send_status(req);
|
||||||
sbp_free_request(req);
|
|
||||||
return;
|
return;
|
||||||
case 3: /* Dummy ORB */
|
case 3: /* Dummy ORB */
|
||||||
req->status.status |= cpu_to_be32(
|
req->status.status |= cpu_to_be32(
|
||||||
|
@ -904,7 +903,6 @@ static void tgt_agent_process_work(struct work_struct *work)
|
||||||
STATUS_BLOCK_SBP_STATUS(
|
STATUS_BLOCK_SBP_STATUS(
|
||||||
SBP_STATUS_DUMMY_ORB_COMPLETE));
|
SBP_STATUS_DUMMY_ORB_COMPLETE));
|
||||||
sbp_send_status(req);
|
sbp_send_status(req);
|
||||||
sbp_free_request(req);
|
|
||||||
return;
|
return;
|
||||||
default:
|
default:
|
||||||
BUG();
|
BUG();
|
||||||
|
@ -989,7 +987,6 @@ static void tgt_agent_fetch_work(struct work_struct *work)
|
||||||
spin_unlock_bh(&agent->lock);
|
spin_unlock_bh(&agent->lock);
|
||||||
|
|
||||||
sbp_send_status(req);
|
sbp_send_status(req);
|
||||||
sbp_free_request(req);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1236,7 +1233,7 @@ static void sbp_handle_command(struct sbp_target_request *req)
|
||||||
req->se_cmd.tag = req->orb_pointer;
|
req->se_cmd.tag = req->orb_pointer;
|
||||||
if (target_submit_cmd(&req->se_cmd, sess->se_sess, req->cmd_buf,
|
if (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,
|
||||||
TCM_SIMPLE_TAG, data_dir, 0))
|
TCM_SIMPLE_TAG, data_dir, TARGET_SCF_ACK_KREF))
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
@ -1248,7 +1245,6 @@ static void sbp_handle_command(struct sbp_target_request *req)
|
||||||
STATUS_BLOCK_LEN(1) |
|
STATUS_BLOCK_LEN(1) |
|
||||||
STATUS_BLOCK_SBP_STATUS(SBP_STATUS_UNSPECIFIED_ERROR));
|
STATUS_BLOCK_SBP_STATUS(SBP_STATUS_UNSPECIFIED_ERROR));
|
||||||
sbp_send_status(req);
|
sbp_send_status(req);
|
||||||
sbp_free_request(req);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1347,22 +1343,29 @@ static int sbp_rw_data(struct sbp_target_request *req)
|
||||||
|
|
||||||
static int sbp_send_status(struct sbp_target_request *req)
|
static int sbp_send_status(struct sbp_target_request *req)
|
||||||
{
|
{
|
||||||
int ret, length;
|
int rc, ret = 0, length;
|
||||||
struct sbp_login_descriptor *login = req->login;
|
struct sbp_login_descriptor *login = req->login;
|
||||||
|
|
||||||
length = (((be32_to_cpu(req->status.status) >> 24) & 0x07) + 1) * 4;
|
length = (((be32_to_cpu(req->status.status) >> 24) & 0x07) + 1) * 4;
|
||||||
|
|
||||||
ret = sbp_run_request_transaction(req, TCODE_WRITE_BLOCK_REQUEST,
|
rc = sbp_run_request_transaction(req, TCODE_WRITE_BLOCK_REQUEST,
|
||||||
login->status_fifo_addr, &req->status, length);
|
login->status_fifo_addr, &req->status, length);
|
||||||
if (ret != RCODE_COMPLETE) {
|
if (rc != RCODE_COMPLETE) {
|
||||||
pr_debug("sbp_send_status: write failed: 0x%x\n", ret);
|
pr_debug("sbp_send_status: write failed: 0x%x\n", rc);
|
||||||
return -EIO;
|
ret = -EIO;
|
||||||
|
goto put_ref;
|
||||||
}
|
}
|
||||||
|
|
||||||
pr_debug("sbp_send_status: status write complete for ORB: 0x%llx\n",
|
pr_debug("sbp_send_status: status write complete for ORB: 0x%llx\n",
|
||||||
req->orb_pointer);
|
req->orb_pointer);
|
||||||
|
/*
|
||||||
return 0;
|
* Drop the extra ACK_KREF reference taken by target_submit_cmd()
|
||||||
|
* ahead of sbp_check_stop_free() -> transport_generic_free_cmd()
|
||||||
|
* final se_cmd->cmd_kref put.
|
||||||
|
*/
|
||||||
|
put_ref:
|
||||||
|
target_put_sess_cmd(&req->se_cmd);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void sbp_sense_mangle(struct sbp_target_request *req)
|
static void sbp_sense_mangle(struct sbp_target_request *req)
|
||||||
|
@ -1822,8 +1825,7 @@ static int sbp_check_stop_free(struct se_cmd *se_cmd)
|
||||||
struct sbp_target_request *req = container_of(se_cmd,
|
struct sbp_target_request *req = container_of(se_cmd,
|
||||||
struct sbp_target_request, se_cmd);
|
struct sbp_target_request, se_cmd);
|
||||||
|
|
||||||
transport_generic_free_cmd(&req->se_cmd, 0);
|
return transport_generic_free_cmd(&req->se_cmd, 0);
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int sbp_count_se_tpg_luns(struct se_portal_group *tpg)
|
static int sbp_count_se_tpg_luns(struct se_portal_group *tpg)
|
||||||
|
|
Loading…
Reference in a new issue