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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-03-07 19:06:56 -08:00
parent 411652a9dd 230f594cc6
commit 167a7291f0
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scst/src/scst_targ.c
View File

@@ -5132,13 +5132,15 @@ static int __scst_init_cmd(struct scst_cmd *cmd)
res = scst_translate_lun(cmd);
if (likely(res == 0)) {
int cnt;
struct scst_tgt_dev *tgt_dev = cmd->tgt_dev;
struct scst_device *dev = cmd->dev;
bool failure = false;
int cnt;
scst_set_cmd_state(cmd, SCST_CMD_STATE_PARSE);
cnt = atomic_inc_return(&cmd->tgt_dev->tgt_dev_cmd_count);
if (unlikely(cnt > cmd->dev->max_tgt_dev_commands)) {
cnt = atomic_inc_return(&tgt_dev->tgt_dev_cmd_count);
if (unlikely(cnt > dev->max_tgt_dev_commands)) {
TRACE(TRACE_FLOW_CONTROL,
"Too many pending commands (%d) in "
"session, returning BUSY to initiator \"%s\"",
@@ -5148,7 +5150,7 @@ static int __scst_init_cmd(struct scst_cmd *cmd)
}
#ifdef CONFIG_SCST_PER_DEVICE_CMD_COUNT_LIMIT
cnt = atomic_inc_return(&cmd->dev->dev_cmd_count);
cnt = atomic_inc_return(&dev->dev_cmd_count);
if (unlikely(cnt > SCST_MAX_DEV_COMMANDS)) {
if (!failure) {
TRACE(TRACE_FLOW_CONTROL,