[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    target: Add missing parentheses
From:       "Linux Kernel Mailing List" <linux-kernel () vger ! kernel ! org>
Date:       2015-05-31 19:06:11
Message-ID: 20150531190611.42CCF660D74 () gitolite ! kernel ! org
[Download RAW message or body]

Gitweb:     http://git.kernel.org/linus/;a=commit;h=6c2faeaa0ecc67098106771cba8b7ed1e99a1b5f
Commit:     6c2faeaa0ecc67098106771cba8b7ed1e99a1b5f
Parent:     63509c60bbc62120fb0e3b287c86ac036b893d90
Refname:    refs/heads/master
Author:     Bart Van Assche <bart.vanassche@sandisk.com>
AuthorDate: Wed May 13 09:19:02 2015 +0200
Committer:  Nicholas Bellinger <nab@linux-iscsi.org>
CommitDate: Thu May 14 21:13:37 2015 -0700

    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>
---
 drivers/target/target_core_transport.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 99a38cf..90c92f0 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)
 						   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;
@@ -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);
-		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;
 	}
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]