projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
[deliverable/linux.git]
/
drivers
/
target
/
target_core_transport.c
diff --git
a/drivers/target/target_core_transport.c
b/drivers/target/target_core_transport.c
index 3fe5cb240b6f6a5b4c8a3fb42396b77dd5701f74..675f2d9d1f14c69142d63179afa38e5b74255243 100644
(file)
--- a/
drivers/target/target_core_transport.c
+++ b/
drivers/target/target_core_transport.c
@@
-1196,7
+1196,7
@@
transport_check_alloc_task_attr(struct se_cmd *cmd)
* Check if SAM Task Attribute emulation is enabled for this
* struct se_device storage object
*/
* Check if SAM Task Attribute emulation is enabled for this
* struct se_device storage object
*/
- if (dev->transport->transport_
type == TRANSPORT_PLUGIN_PHBA_PDEV
)
+ if (dev->transport->transport_
flags & TRANSPORT_FLAG_PASSTHROUGH
)
return 0;
if (cmd->sam_task_attr == TCM_ACA_TAG) {
return 0;
if (cmd->sam_task_attr == TCM_ACA_TAG) {
@@
-1770,7
+1770,7
@@
static int target_write_prot_action(struct se_cmd *cmd)
sectors, 0, NULL, 0);
if (unlikely(cmd->pi_err)) {
spin_lock_irq(&cmd->t_state_lock);
sectors, 0, NULL, 0);
if (unlikely(cmd->pi_err)) {
spin_lock_irq(&cmd->t_state_lock);
- cmd->transport_state &= ~
CMD_T_BUSY|CMD_T_SENT
;
+ cmd->transport_state &= ~
(CMD_T_BUSY|CMD_T_SENT)
;
spin_unlock_irq(&cmd->t_state_lock);
transport_generic_request_failure(cmd, cmd->pi_err);
return -1;
spin_unlock_irq(&cmd->t_state_lock);
transport_generic_request_failure(cmd, cmd->pi_err);
return -1;
@@
-1787,7
+1787,7
@@
static bool target_handle_task_attr(struct se_cmd *cmd)
{
struct se_device *dev = cmd->se_dev;
{
struct se_device *dev = cmd->se_dev;
- if (dev->transport->transport_
type == TRANSPORT_PLUGIN_PHBA_PDEV
)
+ if (dev->transport->transport_
flags & TRANSPORT_FLAG_PASSTHROUGH
)
return false;
/*
return false;
/*
@@
-1868,7
+1868,7
@@
void target_execute_cmd(struct se_cmd *cmd)
if (target_handle_task_attr(cmd)) {
spin_lock_irq(&cmd->t_state_lock);
if (target_handle_task_attr(cmd)) {
spin_lock_irq(&cmd->t_state_lock);
- cmd->transport_state &= ~
CMD_T_BUSY|CMD_T_SENT
;
+ cmd->transport_state &= ~
(CMD_T_BUSY | CMD_T_SENT)
;
spin_unlock_irq(&cmd->t_state_lock);
return;
}
spin_unlock_irq(&cmd->t_state_lock);
return;
}
@@
-1912,7
+1912,7
@@
static void transport_complete_task_attr(struct se_cmd *cmd)
{
struct se_device *dev = cmd->se_dev;
{
struct se_device *dev = cmd->se_dev;
- if (dev->transport->transport_
type == TRANSPORT_PLUGIN_PHBA_PDEV
)
+ if (dev->transport->transport_
flags & TRANSPORT_FLAG_PASSTHROUGH
)
return;
if (cmd->sam_task_attr == TCM_SIMPLE_TAG) {
return;
if (cmd->sam_task_attr == TCM_SIMPLE_TAG) {
@@
-1957,8
+1957,7
@@
static void transport_complete_qf(struct se_cmd *cmd)
case DMA_TO_DEVICE:
if (cmd->se_cmd_flags & SCF_BIDI) {
ret = cmd->se_tfo->queue_data_in(cmd);
case DMA_TO_DEVICE:
if (cmd->se_cmd_flags & SCF_BIDI) {
ret = cmd->se_tfo->queue_data_in(cmd);
- if (ret < 0)
- break;
+ break;
}
/* Fall through for DMA_TO_DEVICE */
case DMA_NONE:
}
/* Fall through for DMA_TO_DEVICE */
case DMA_NONE:
This page took
0.026869 seconds
and
5
git commands to generate.