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

Small code reorganization.

Browse Source 
No functionality changed



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5557 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2014-05-30 00:42:34 +00:00
parent f5ab9ef30a
commit 6ef356ce70
3 changed files with 90 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
scst/include/scst.h
View File

@@ -1909,6 +1909,13 @@ struct scst_order_data {
spinlock_t init_done_lock;
};
struct scst_orig_sg_data {
int *p_orig_sg_cnt;
int orig_sg_cnt;
struct scatterlist *orig_sg_entry;
int orig_entry_offs, orig_entry_len;
};
/*
* SCST command, analog of I_T_L_Q nexus or task
*/
@@ -1998,9 +2005,7 @@ struct scst_cmd {
/* Set if the target driver called scst_set_expected() */
unsigned int expected_values_set:1;
/*
* Set if the SG buffer was modified by scst_adjust_sg()
*/
/* Set if the SG buffer was modified by scst_adjust_sg() */
unsigned int sg_buff_modified:1;
/*
@@ -2229,11 +2234,8 @@ struct scst_cmd {
/* Used for storage of dev handler private stuff */
void *dh_priv;
/* Used to restore sg if it was modified by scst_adjust_sg() */
int *p_orig_sg_cnt;
int orig_sg_cnt;
struct scatterlist *orig_sg_entry;
int orig_entry_offs, orig_entry_len;
/* List entry for dev's blocked_cmd_list */
struct list_head blocked_cmd_list_entry;
/* Used to retry commands in case of double UA */
int dbl_ua_orig_resp_data_len, dbl_ua_orig_data_direction;
@@ -2244,18 +2246,24 @@ struct scst_cmd {
*/
struct list_head mgmt_cmd_list;
/* List entry for dev's blocked_cmd_list */
struct list_head blocked_cmd_list_entry;
/* Used to restore sg if it was modified by scst_adjust_sg() */
struct scst_orig_sg_data orig_sg;
/* Counter of the corresponding SCST_PR_ABORT_ALL TM commands */
struct scst_pr_abort_all_pending_mgmt_cmds_counter *pr_abort_counter;
/* Per opcode stuff */
union {
/* Counter of the corresponding SCST_PR_ABORT_ALL TM commands */
struct scst_pr_abort_all_pending_mgmt_cmds_counter *pr_abort_counter;
/*
* List of parsed data descriptors for commands operating with
* several lba and data_len pairs, like UNMAP, and its size in elements.
*/
void *cmd_data_descriptors;
int cmd_data_descriptors_cnt;
/*
* List of parsed data descriptors for commands operating with
* several lba and data_len pairs, like UNMAP, and its size
* in elements.
*/
struct {
void *cmd_data_descriptors;
int cmd_data_descriptors_cnt;
};
};
#if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING)
char not_parsed_op_name[8];

90
scst/src/scst_lib.c
View File

@@ -3105,19 +3105,20 @@ next:
return;
}
static void scst_adjust_sg(struct scst_cmd *cmd, struct scatterlist *sg,
int *sg_cnt, int adjust_len)
static bool __scst_adjust_sg(struct scst_cmd *cmd, struct scatterlist *sg,
int *sg_cnt, int adjust_len, struct scst_orig_sg_data *orig_sg)
{
struct scatterlist *sgi;
int i, l;
bool res = false;
TRACE_ENTRY();
l = 0;
for_each_sg(sg, sgi, *sg_cnt, i) {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
TRACE_DBG("i %d, sg_cnt %d, sg %p, page_link %lx", i,
*sg_cnt, sg, sgi->page_link);
TRACE_DBG("i %d, sg_cnt %d, sg %p, page_link %lx, len %d", i,
*sg_cnt, sg, sgi->page_link, sgi->length);
#else
TRACE_DBG("i %d, sg_cnt %d, sg %p, page_link %lx", i,
*sg_cnt, sg, 0UL);
@@ -3125,26 +3126,57 @@ static void scst_adjust_sg(struct scst_cmd *cmd, struct scatterlist *sg,
l += sgi->length;
if (l >= adjust_len) {
int left = adjust_len - (l - sgi->length);
#ifdef CONFIG_SCST_DEBUG
TRACE(TRACE_SG_OP|TRACE_MEMORY, "cmd %p (tag %llu), "
"sg %p, sg_cnt %d, adjust_len %d, i %d, "
"sg[j].length %d, left %d",
TRACE_DBG_FLAG(TRACE_SG_OP|TRACE_MEMORY|TRACE_DEBUG,
"cmd %p (tag %llu), sg %p, sg_cnt %d, "
"adjust_len %d, i %d, sg[j].length %d, left %d",
cmd, (long long unsigned int)cmd->tag,
sg, *sg_cnt, adjust_len, i,
sgi->length, left);
#endif
cmd->p_orig_sg_cnt = sg_cnt;
cmd->orig_sg_cnt = *sg_cnt;
cmd->orig_sg_entry = sgi;
cmd->orig_entry_offs = sgi->offset;
cmd->orig_entry_len = sgi->length;
orig_sg->p_orig_sg_cnt = sg_cnt;
orig_sg->orig_sg_cnt = *sg_cnt;
orig_sg->orig_sg_entry = sgi;
orig_sg->orig_entry_offs = sgi->offset;
orig_sg->orig_entry_len = sgi->length;
*sg_cnt = (left > 0) ? i+1 : i;
sgi->length = left;
cmd->sg_buff_modified = 1;
res = true;
break;
}
}
TRACE_EXIT_RES(res);
return res;
}
/*
* Makes cmd's SG shorter on adjust_len bytes. Reg_sg is true for cmd->sg
* and false for cmd->write_sg.
*/
static void scst_adjust_sg(struct scst_cmd *cmd, bool reg_sg,
int adjust_len)
{
struct scatterlist *sg;
int *sg_cnt;
TRACE_ENTRY();
EXTRACHECKS_BUG_ON(cmd->sg_buff_modified);
if (reg_sg) {
sg = cmd->sg;
sg_cnt = &cmd->sg_cnt;
} else {
sg = *cmd->write_sg;
sg_cnt = cmd->write_sg_cnt;
}
TRACE_DBG("reg_sg %d, adjust_len %d", reg_sg, adjust_len);
cmd->sg_buff_modified = __scst_adjust_sg(cmd, sg, sg_cnt, adjust_len,
&cmd->orig_sg);
TRACE_EXIT();
return;
}
@@ -3156,13 +3188,20 @@ static void scst_adjust_sg(struct scst_cmd *cmd, struct scatterlist *sg,
*/
void scst_restore_sg_buff(struct scst_cmd *cmd)
{
TRACE_MEM("cmd %p, sg %p, orig_sg_entry %p, orig_entry_offs %d, "
"orig_entry_len %d, orig_sg_cnt %d", cmd, cmd->sg,
cmd->orig_sg_entry, cmd->orig_entry_offs, cmd->orig_entry_len,
cmd->orig_sg_cnt);
cmd->orig_sg_entry->offset = cmd->orig_entry_offs;
cmd->orig_sg_entry->length = cmd->orig_entry_len;
*cmd->p_orig_sg_cnt = cmd->orig_sg_cnt;
TRACE_DBG_FLAG(TRACE_DEBUG|TRACE_MEMORY, "cmd %p, sg %p, "
"orig_sg_entry %p, orig_entry_offs %d, orig_entry_len %d, "
"orig_sg_cnt %d", cmd, cmd->sg, cmd->orig_sg.orig_sg_entry,
cmd->orig_sg.orig_entry_offs, cmd->orig_sg.orig_entry_len,
cmd->orig_sg.orig_sg_cnt);
EXTRACHECKS_BUG_ON(!cmd->sg_buff_modified);
if (cmd->sg_buff_modified) {
cmd->orig_sg.orig_sg_entry->offset = cmd->orig_sg.orig_entry_offs;
cmd->orig_sg.orig_sg_entry->length = cmd->orig_sg.orig_entry_len;
*cmd->orig_sg.p_orig_sg_cnt = cmd->orig_sg.orig_sg_cnt;
}
cmd->sg_buff_modified = 0;
}
EXPORT_SYMBOL(scst_restore_sg_buff);
@@ -3200,7 +3239,7 @@ void scst_set_resp_data_len(struct scst_cmd *cmd, int resp_data_len)
goto out;
}
scst_adjust_sg(cmd, cmd->sg, &cmd->sg_cnt, resp_data_len);
scst_adjust_sg(cmd, true, resp_data_len);
cmd->resid_possible = 1;
@@ -3218,7 +3257,7 @@ void scst_limit_sg_write_len(struct scst_cmd *cmd)
cmd->write_len, cmd, *cmd->write_sg, *cmd->write_sg_cnt);
scst_check_restore_sg_buff(cmd);
scst_adjust_sg(cmd, *cmd->write_sg, cmd->write_sg_cnt, cmd->write_len);
scst_adjust_sg(cmd, false, cmd->write_len);
TRACE_EXIT();
return;
@@ -3241,8 +3280,7 @@ void scst_adjust_resp_data_len(struct scst_cmd *cmd)
"sg_cnt %d)", cmd->adjusted_resp_data_len, cmd, cmd->sg,
cmd->sg_cnt);
scst_check_restore_sg_buff(cmd);
scst_adjust_sg(cmd, cmd->sg, &cmd->sg_cnt,
cmd->adjusted_resp_data_len);
scst_adjust_sg(cmd, true, cmd->adjusted_resp_data_len);
}
out:

2
scst/src/scst_targ.c
View File

@@ -1801,8 +1801,6 @@ static void scst_cmd_done_local(struct scst_cmd *cmd, int next_state,
{
TRACE_ENTRY();
EXTRACHECKS_BUG_ON(cmd->pr_abort_counter != NULL);
scst_set_exec_time(cmd);
TRACE(TRACE_SCSI, "cmd %p, status %x, msg_status %x, host_status %x, "