svn commit: r251654 - in head/sys: cam cam/scsi geom

[Glen Barber]

On Wed, Jun 12, 2013 at 01:36:20PM +0000, Alexander Motin wrote:
> Author: mav
> Date: Wed Jun 12 13:36:20 2013
> New Revision: 251654
> URL: http://svnweb.freebsd.org/changeset/base/251654
> 
> Log:
>   Make CAM return and GEOM DISK pass through new GEOM::lunid attribute.
>   
>   SPC-4 specification states that serial number may be property of device,
>   but not a specific logical unit.  People reported about FC storages using
>   serial number in that way, making it unusable for purposes of LUN multipath
>   detection.  SPC-4 states that designators associated with logical unit from
>   the VPD page 83h "Device Identification" should be used for that purpose.
>   Report first of them in the new attribute in such preference order: NAA,
>   EUI-64, T10 and SCSI name string.
>   
>   While there, make GEOM DISK properly report GEOM::ident in XML output also
>   using d_getattr() method, if available.  This fixes serial numbers reporting
>   for SCSI disks in `geom disk list` output and confxml.
>   

I think this change breaks the build.

cc  -O -pipe  -DRESCUE -std=gnu99 -Qunused-arguments -Wsystem-headers -Werror -Wall -Wno-format-
y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wno-unini
tialized -Wno-pointer-sign -Wno-empty-body -Wno-string-plus-int -Wno-tautological-compare -Wno-u
nused-value -Wno-parentheses-equality -Wno-unused-function -Wno-conversion -c /src/sbin/camcontrol/camcontrol.c
/src/sbin/camcontrol/camcontrol.c:6955:13: error: incompatible pointer
types assigning to 'uint8_t *' (aka 'unsigned char *') from 'struct scsi_vpd_id_descriptor *'
[-Werror,-Wincompatible-pointer-types]
                item_addr = scsi_get_devid(item->device_id,
                          ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
*** Error code 1

Stop.
make: stopped in /src/sbin/camcontrol
*** Error code 1

Glen

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20130612/59899e57/attachment.sig>