30c30
< __FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_targ_bh.c 201758 2010-01-07 21:01:37Z mbr $");
---
> __FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_targ_bh.c 225950 2011-10-03 20:32:55Z ken $");
115c115
< static struct scsi_sense_data no_lun_sense_data =
---
> static struct scsi_sense_data_fixed no_lun_sense_data =
121,122c121,122
< /*extra_len*/offsetof(struct scsi_sense_data, fru)
< - offsetof(struct scsi_sense_data, extra_len),
---
> /*extra_len*/offsetof(struct scsi_sense_data_fixed, fru)
> - offsetof(struct scsi_sense_data_fixed, extra_len),
128c128
< static const int request_sense_size = offsetof(struct scsi_sense_data, fru);
---
> static const int request_sense_size = offsetof(struct scsi_sense_data_fixed, fru);
590c590,592
< atio->sense_data = no_lun_sense_data;
---
> bcopy(&no_lun_sense_data, &atio->sense_data,
> min(sizeof(no_lun_sense_data),
> sizeof(atio->sense_data)));
633c635,637
< atio->sense_data = no_lun_sense_data;
---
> bcopy(&no_lun_sense_data, &atio->sense_data,
> min(sizeof(no_lun_sense_data),
> sizeof(atio->sense_data)));