mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-28 09:20:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst: Rework scst_prepare_request_sense()

Browse Source 
This patch makes the implementation of scst_prepare_request_sense() consistent
with the other code that submits internal commands.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8512 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-08-21 21:31:31 +00:00
parent dd52454052
commit f16c5d1b2e
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
scst/src/scst_lib.c
View File

@@ -5843,16 +5843,31 @@ static void scst_prelim_finish_internal_cmd(struct scst_cmd *cmd)
return; return;
} }
struct scst_request_sense_priv {
scst_i_finish_fn_t finish_fn;
struct scst_cmd *orig_cmd;
};
static void scst_complete_request_sense(struct scst_cmd *cmd);
int scst_prepare_request_sense(struct scst_cmd *orig_cmd) int scst_prepare_request_sense(struct scst_cmd *orig_cmd)
{ {
int res = 0;
static const uint8_t request_sense[6] = { static const uint8_t request_sense[6] = {
REQUEST_SENSE, 0, 0, 0, SCST_SENSE_BUFFERSIZE, 0 REQUEST_SENSE, 0, 0, 0, SCST_SENSE_BUFFERSIZE, 0
}; };
struct scst_request_sense_priv *priv;
struct scst_cmd *rs_cmd; struct scst_cmd *rs_cmd;
int res = -ENOMEM;
TRACE_ENTRY(); TRACE_ENTRY();
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv)
goto out;
priv->finish_fn = scst_complete_request_sense;
priv->orig_cmd = orig_cmd;
if (orig_cmd->sense != NULL) { if (orig_cmd->sense != NULL) {
TRACE_MEM("Releasing sense %p (orig_cmd %p)", TRACE_MEM("Releasing sense %p (orig_cmd %p)",
orig_cmd->sense, orig_cmd); orig_cmd->sense, orig_cmd);
@@ -5864,9 +5879,9 @@ int scst_prepare_request_sense(struct scst_cmd *orig_cmd)
request_sense, sizeof(request_sense), request_sense, sizeof(request_sense),
SCST_CMD_QUEUE_HEAD_OF_QUEUE); SCST_CMD_QUEUE_HEAD_OF_QUEUE);
if (rs_cmd == NULL) if (rs_cmd == NULL)
goto out_error; goto free_priv;
rs_cmd->tgt_i_priv = orig_cmd; rs_cmd->tgt_i_priv = priv;
rs_cmd->cdb[1] |= scst_get_cmd_dev_d_sense(orig_cmd); rs_cmd->cdb[1] |= scst_get_cmd_dev_d_sense(orig_cmd);
rs_cmd->expected_data_direction = SCST_DATA_READ; rs_cmd->expected_data_direction = SCST_DATA_READ;
@@ -5884,19 +5899,22 @@ out:
TRACE_EXIT_RES(res); TRACE_EXIT_RES(res);
return res; return res;
out_error: free_priv:
res = -1; kfree(priv);
goto out; goto out;
} }
static void scst_complete_request_sense(struct scst_cmd *req_cmd) static void scst_complete_request_sense(struct scst_cmd *req_cmd)
{ {
struct scst_cmd *orig_cmd = req_cmd->tgt_i_priv; struct scst_request_sense_priv *priv = req_cmd->tgt_i_priv;
struct scst_cmd *orig_cmd = priv->orig_cmd;
uint8_t *buf; uint8_t *buf;
int len; int len;
TRACE_ENTRY(); TRACE_ENTRY();
kfree(priv);
sBUG_ON(orig_cmd == NULL); sBUG_ON(orig_cmd == NULL);
len = scst_get_buf_full(req_cmd, &buf); len = scst_get_buf_full(req_cmd, &buf);
@@ -6970,10 +6988,7 @@ int scst_finish_internal_cmd(struct scst_cmd *cmd)
scst_finish_cmd_mgmt(cmd); scst_finish_cmd_mgmt(cmd);
} }
if (cmd->cdb[0] == REQUEST_SENSE) icmd_priv->finish_fn(cmd);
scst_complete_request_sense(cmd);
else
icmd_priv->finish_fn(cmd);
__scst_cmd_put(cmd); __scst_cmd_put(cmd);