lkml.org 
[lkml]   [2012]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[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@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



\
 
 \ /
  Last update: 2012-04-10 14:59    [W:0.450 / U:0.156 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site