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

Minor cleanups

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1794 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2010-06-28 18:07:11 +00:00
parent 13dea2fd6a
commit fdbb5fcc7f
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scst/src/scst_lib.c
View File

@@ -5405,12 +5405,13 @@ int scst_sbc_generic_parse(struct scst_cmd *cmd,
}
if (cmd->op_flags & SCST_TRANSFER_LEN_TYPE_FIXED) {
int block_shift = get_block_shift(cmd);
/*
* No need for locks here, since *_detach() can not be
* called, when there are existing commands.
*/
cmd->bufflen = cmd->bufflen << get_block_shift(cmd);
cmd->out_bufflen = cmd->out_bufflen << get_block_shift(cmd);
cmd->bufflen = cmd->bufflen << block_shift;
cmd->out_bufflen = cmd->out_bufflen << block_shift;
}
set_timeout:
@@ -5468,8 +5469,9 @@ int scst_cdrom_generic_parse(struct scst_cmd *cmd,
}
if (cmd->op_flags & SCST_TRANSFER_LEN_TYPE_FIXED) {
cmd->bufflen = cmd->bufflen << get_block_shift(cmd);
cmd->out_bufflen = cmd->out_bufflen << get_block_shift(cmd);
int block_shift = get_block_shift(cmd);
cmd->bufflen = cmd->bufflen << block_shift;
cmd->out_bufflen = cmd->out_bufflen << block_shift;
}
set_timeout:
@@ -5527,8 +5529,9 @@ int scst_modisk_generic_parse(struct scst_cmd *cmd,
}
if (cmd->op_flags & SCST_TRANSFER_LEN_TYPE_FIXED) {
cmd->bufflen = cmd->bufflen << get_block_shift(cmd);
cmd->out_bufflen = cmd->out_bufflen << get_block_shift(cmd);
int block_shift = get_block_shift(cmd);
cmd->bufflen = cmd->bufflen << block_shift;
cmd->out_bufflen = cmd->out_bufflen << block_shift;
}
set_timeout:
@@ -5583,8 +5586,9 @@ int scst_tape_generic_parse(struct scst_cmd *cmd,
}
if (cmd->op_flags & SCST_TRANSFER_LEN_TYPE_FIXED & cmd->cdb[1]) {
cmd->bufflen = cmd->bufflen * get_block_size(cmd);
cmd->out_bufflen = cmd->out_bufflen * get_block_size(cmd);
int block_size = get_block_size(cmd);
cmd->bufflen = cmd->bufflen * block_size;
cmd->out_bufflen = cmd->out_bufflen * block_size;
}
if ((cmd->op_flags & (SCST_SMALL_TIMEOUT | SCST_LONG_TIMEOUT)) == 0)

1
scst/src/scst_targ.c
View File

@@ -4844,6 +4844,7 @@ out:
return res;
}
/* IRQs supposed to be disabled */
static bool __scst_check_unblock_aborted_cmd(struct scst_cmd *cmd,
struct list_head *list_entry)
{