Commit d058fd31 authored Jul 20, 2010 by Bart Van Assche Committed by James Bottomley Jul 28, 2010

[SCSI] fcoe: make it possible to verify fcoe with sparse



Analyzing fcoe with sparse currently fails. This is because struct
fcoe_rcv_info contains two enum members that have been declared with
__attribute__((packed)). Apparently gcc honors this attribute while sparse
ignores it. The result is that sizeof(struct fcoe_rcv_info)
== sizeof(struct sk_buff::cb) == 48 on a 64-bit system according to gcc, but
not according to sparse. The patch below modifies the definition of
struct fcoe_rcv_info such that gcc and sparse interpret this structure
definition in the same way. The current sparse output is as follows:

$ cd linux-2.6.34
$ make C=2 M=drivers/scsi/fcoe modules
 CHECK   drivers/scsi/fcoe/fcoe.c

include/scsi/fc_frame.h:81:9: error: invalid bitfield width, -1.
 CC [M]  drivers/scsi/fcoe/fcoe.o
 CHECK   drivers/scsi/fcoe/libfcoe.c

include/scsi/fc_frame.h:81:9: error: invalid bitfield width, -1.
drivers/scsi/fcoe/libfcoe.c:56:37: error: invalid initializer

Signed-off-by: Bart Van Assche <bart.vanassche@gmail.com>
Cc: jeykholt@cisco.com
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

parent ba402804

include/scsi/fc_frame.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -66,8 +66,8 @@ struct fcoe_rcv_info {
		struct fc_fcp_pkt fr_fsp; / for the corresponding fcp I/O */
		u32 fr_crc;
		u16 fr_max_payload; /* max FC payload */
		enum fc_sof fr_sof; /* start of frame delimiter */
		enum fc_eof fr_eof; /* end of frame delimiter */
		u8 fr_sof; /* start of frame delimiter */
		u8 fr_eof; /* end of frame delimiter */
		u8 fr_flags; /* flags - see below */
		u8 granted_mac[ETH_ALEN]; /* FCoE MAC address */
		};

Admin message