diff options
author | Bart Van Assche <bart.vanassche@sandisk.com> | 2015-05-13 03:19:02 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2015-05-15 00:13:37 -0400 |
commit | 6c2faeaa0ecc67098106771cba8b7ed1e99a1b5f (patch) | |
tree | 5bcdca50becb2fb1b390cd6092e62c65bcb96c59 /drivers/target | |
parent | 63509c60bbc62120fb0e3b287c86ac036b893d90 (diff) |
target: Add missing parentheses
Code like " &= ~CMD_T_BUSY | ..." only clears CMD_T_BUSY but not
the other flag. Modify these statements such that both flags are
cleared.
(Fix fuzz for target_write_prot_action code in mainline - nab)
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
-rw-r--r-- | drivers/target/target_core_transport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 99a38cf320ff..90c92f04a586 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c | |||
@@ -1770,7 +1770,7 @@ static int target_write_prot_action(struct se_cmd *cmd) | |||
1770 | sectors, 0, NULL, 0); | 1770 | sectors, 0, NULL, 0); |
1771 | if (unlikely(cmd->pi_err)) { | 1771 | if (unlikely(cmd->pi_err)) { |
1772 | spin_lock_irq(&cmd->t_state_lock); | 1772 | spin_lock_irq(&cmd->t_state_lock); |
1773 | cmd->transport_state &= ~CMD_T_BUSY|CMD_T_SENT; | 1773 | cmd->transport_state &= ~(CMD_T_BUSY|CMD_T_SENT); |
1774 | spin_unlock_irq(&cmd->t_state_lock); | 1774 | spin_unlock_irq(&cmd->t_state_lock); |
1775 | transport_generic_request_failure(cmd, cmd->pi_err); | 1775 | transport_generic_request_failure(cmd, cmd->pi_err); |
1776 | return -1; | 1776 | return -1; |
@@ -1868,7 +1868,7 @@ void target_execute_cmd(struct se_cmd *cmd) | |||
1868 | 1868 | ||
1869 | if (target_handle_task_attr(cmd)) { | 1869 | if (target_handle_task_attr(cmd)) { |
1870 | spin_lock_irq(&cmd->t_state_lock); | 1870 | spin_lock_irq(&cmd->t_state_lock); |
1871 | cmd->transport_state &= ~CMD_T_BUSY|CMD_T_SENT; | 1871 | cmd->transport_state &= ~(CMD_T_BUSY | CMD_T_SENT); |
1872 | spin_unlock_irq(&cmd->t_state_lock); | 1872 | spin_unlock_irq(&cmd->t_state_lock); |
1873 | return; | 1873 | return; |
1874 | } | 1874 | } |