[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1349946933-30314-1-git-send-email-james.hogan@imgtec.com>
Date: Thu, 11 Oct 2012 10:15:33 +0100
From: James Hogan <james.hogan@...tec.com>
To: "James E.J. Bottomley" <JBottomley@...allels.com>
CC: <linux-scsi@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
James Hogan <james.hogan@...tec.com>
Subject: [RESEND PATCH] scsi: make struct scsi_varlen_cdb_hdr packed
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@...tec.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 66216c1..3beaef3 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -198,7 +198,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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists