summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoger, Babu <Babu.Moger@netapp.com>2012-01-24 20:38:42 +0000
committerJames Bottomley <JBottomley@Parallels.com>2012-02-19 08:08:59 -0600
commit3384db9eb8b1e4f94a02c2a0ce3c0efe6142f3ba (patch)
tree883b9e253f755a5622c4c8ba250c86550e942fea
parent98788a134979fe66c32a1393adf66f7d3faf16ea (diff)
downloadop-kernel-dev-3384db9eb8b1e4f94a02c2a0ce3c0efe6142f3ba.zip
op-kernel-dev-3384db9eb8b1e4f94a02c2a0ce3c0efe6142f3ba.tar.gz
[SCSI] Correctly set the scsi host/msg/status bytes
Resubmitting as my previous post had format issues and did not go llinux-scsi. This patch changes the function to set_msg_byte, set_host_byte and set_driver_byte to correctly set the corresponding bytes appropriately. It will reset the original setting and correctly set it to the new value. The previous OR operation does not always set it back to new value. Look at patch 2/2 for an example. Signed-off-by: Babu Moger <babu.moger@netapp.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--include/scsi/scsi_cmnd.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index a5e885a..9be0128 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -289,17 +289,17 @@ static inline struct scsi_data_buffer *scsi_prot(struct scsi_cmnd *cmd)
static inline void set_msg_byte(struct scsi_cmnd *cmd, char status)
{
- cmd->result |= status << 8;
+ cmd->result = (cmd->result & 0xffff00ff) | (status << 8);
}
static inline void set_host_byte(struct scsi_cmnd *cmd, char status)
{
- cmd->result |= status << 16;
+ cmd->result = (cmd->result & 0xff00ffff) | (status << 16);
}
static inline void set_driver_byte(struct scsi_cmnd *cmd, char status)
{
- cmd->result |= status << 24;
+ cmd->result = (cmd->result & 0x00ffffff) | (status << 24);
}
#endif /* _SCSI_SCSI_CMND_H */
OpenPOWER on IntegriCloud