From: Dan Carpenter <dan.carpenter@oracle.com> To: Jayamohan Kallickal <jayamohan.kallickal@emulex.com> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>, linux-scsi@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] [SCSI] be2iscsi: cleanup a min_t() call Date: Mon, 26 Sep 2011 06:23:37 +0000 [thread overview] Message-ID: <20110926062337.GD11832@elgon.mountain> (raw) "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. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- Compile tested only. Sorry. diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 57fea38..344af8d 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; @@ -1147,9 +1146,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)); }
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com> To: Jayamohan Kallickal <jayamohan.kallickal@emulex.com> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>, linux-scsi@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] [SCSI] be2iscsi: cleanup a min_t() call Date: Mon, 26 Sep 2011 09:23:37 +0300 [thread overview] Message-ID: <20110926062337.GD11832@elgon.mountain> (raw) "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. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- Compile tested only. Sorry. diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 57fea38..344af8d 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; @@ -1147,9 +1146,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)); }
next reply other threads:[~2011-09-26 6:23 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-09-26 6:23 Dan Carpenter [this message] 2011-09-26 6:23 ` [patch] [SCSI] be2iscsi: cleanup a min_t() call Dan Carpenter 2011-11-18 14:00 ` Dan Carpenter 2011-11-18 14:00 ` Dan Carpenter 2011-11-18 19:28 ` Mike Christie 2011-11-18 19:28 ` Mike Christie 2011-11-29 20:55 ` Jayamohan.Kallickal 2011-11-29 20:55 ` Jayamohan.Kallickal
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20110926062337.GD11832@elgon.mountain \ --to=dan.carpenter@oracle.com \ --cc=JBottomley@parallels.com \ --cc=jayamohan.kallickal@emulex.com \ --cc=kernel-janitors@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.