From: James Hogan <james.hogan@imgtec.com>
To: "James E.J. Bottomley" <JBottomley@parallels.com>,
linux-scsi@vger.kernel.org,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH] scsi: make struct scsi_varlen_cdb_hdr packed
Date: Tue, 10 Apr 2012 13:38:53 +0100 [thread overview]
Message-ID: <4F8429DD.3010700@imgtec.com> (raw)
The struct scsi_varlen_cdb_hdr is expected to be exactly 10 bytes when
used in struct osd_cdb_head, but it isn't marked as packed. Some
architectures will round the struct size up which triggers BUILD_BUG_ON
compile errors in osd_initiator.c when the outer structs are unexpected
sizes. This is fixed by marking struct scsi_varlen_cdb_hdr as __packed.
Signed-off-by: James Hogan <james.hogan@imgtec.com>
---
include/scsi/scsi.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index f34a5a8..c75c8c8 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -196,7 +196,7 @@ struct scsi_varlen_cdb_hdr {
__u8 additional_cdb_length; /* total cdb length - 8 */
__be16 service_action;
/* service specific data follows */
-};
+} __packed;
static inline unsigned
scsi_varlen_cdb_length(const void *hdr)
--
1.7.7.6
WARNING: multiple messages have this Message-ID (diff)
From: James Hogan <james.hogan@imgtec.com>
To: "James E.J. Bottomley" <JBottomley@parallels.com>,
<linux-scsi@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH] scsi: make struct scsi_varlen_cdb_hdr packed
Date: Tue, 10 Apr 2012 13:38:53 +0100 [thread overview]
Message-ID: <4F8429DD.3010700@imgtec.com> (raw)
The struct scsi_varlen_cdb_hdr is expected to be exactly 10 bytes when
used in struct osd_cdb_head, but it isn't marked as packed. Some
architectures will round the struct size up which triggers BUILD_BUG_ON
compile errors in osd_initiator.c when the outer structs are unexpected
sizes. This is fixed by marking struct scsi_varlen_cdb_hdr as __packed.
Signed-off-by: James Hogan <james.hogan@imgtec.com>
---
include/scsi/scsi.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index f34a5a8..c75c8c8 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -196,7 +196,7 @@ struct scsi_varlen_cdb_hdr {
__u8 additional_cdb_length; /* total cdb length - 8 */
__be16 service_action;
/* service specific data follows */
-};
+} __packed;
static inline unsigned
scsi_varlen_cdb_length(const void *hdr)
--
1.7.7.6
next reply other threads:[~2012-04-10 12:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-10 12:38 James Hogan [this message]
2012-04-10 12:38 ` [PATCH] scsi: make struct scsi_varlen_cdb_hdr packed James Hogan
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=4F8429DD.3010700@imgtec.com \
--to=james.hogan@imgtec.com \
--cc=JBottomley@parallels.com \
--cc=linux-kernel@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: link
Be 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.