From: root <root@localhost.localdomain>
Date: Wed, 2 May 2012 13:58:04 +0000 (+0530)
Subject: be2iscsi: cleanup a min_t() call
X-Git-Tag: v2.6.39-400.9.0~423^2~58
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5a40b18221e02d3db76e93373f24351991e145a0;p=users%2Fjedix%2Flinux-maple.git

be2iscsi: cleanup a min_t() call

 "sense_len" was declared as int type but actually it only stores a
 u16 value that comes from hardware.  The cast to u16 in min_t()
 confuses static analysis because it truncates the int to u16 so I've
 fixed the declaration to reflect that "sense_len" is just a u16.

 Also there was a call to cpu_to_be16() which I've changed to
 be16_to_cpu().  The functions are equivalent, but obviously the
 hardware is big endian and we're doing the min_t() comparison on CPU
 endian values.

 This whole patch is just a cleanup and doesn't affect how the code
 works.

 upstream commit id : 4053a4be525d3441cad6cd1ae207177f03eb9ce7
 Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: root <root@localhost.(none)>
---

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 34ebb61a6aa2..756fd283a7d2 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -1104,7 +1104,6 @@ be_complete_io(struct beiscsi_conn *beiscsi_conn,
 	struct be_status_bhs *sts_bhs =
 				(struct be_status_bhs *)io_task->cmd_bhs;
 	struct iscsi_conn *conn = beiscsi_conn->conn;
-	unsigned int sense_len;
 	unsigned char *sense;
 	u32 resid = 0, exp_cmdsn, max_cmdsn;
 	u8 rsp, status, flags;
@@ -1152,9 +1151,11 @@ be_complete_io(struct beiscsi_conn *beiscsi_conn,
 	}
 
 	if (status == SAM_STAT_CHECK_CONDITION) {
+		u16 sense_len;
 		unsigned short *slen = (unsigned short *)sts_bhs->sense_info;
+
 		sense = sts_bhs->sense_info + sizeof(unsigned short);
-		sense_len =  cpu_to_be16(*slen);
+		sense_len = be16_to_cpu(*slen);
 		memcpy(task->sc->sense_buffer, sense,
 		       min_t(u16, sense_len, SCSI_SENSE_BUFFERSIZE));
 	}