Merge branch 'svn-trunk' into master

This commit is contained in:
Bart Van Assche
2020-09-19 09:28:13 -07:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1289,7 +1289,7 @@ out:
out_nomem:
if (ucmd->cmd != NULL)
scst_set_busy(ucmd->cmd);
fallthrough;
/* fall through */
out_err:
if (ucmd->cmd != NULL)

View File

@@ -1358,7 +1358,7 @@ set_res:
TRACE_DBG_FLAG(TRACE_DEBUG|TRACE_MINOR, "Atomic context and "
"non-WRITE data direction, rescheduling (cmd %p)", cmd);
res = SCST_CMD_STATE_RES_NEED_THREAD;
fallthrough;
/* fall through */
}
#endif