OpenSolaris

Printable Version Enter a New Search
Bug ID 6795429
Synopsis Virtually identical copies of iscsi_protocol.h live in two locations
State 10-Fix Delivered (Fix available in build)
Category:Subcategory driver:iscsi
Keywords
Responsible Engineer Peter Dunlap
Reported Against
Duplicate Of
Introduced In solaris_nevada
Commit to Fix snv_108
Fixed In snv_108
Release Fixed solaris_nevada(snv_108)
Related Bugs
Submit Date 19-January-2009
Last Update Date 4-November-2009
Description 
After the NWS/ON merge in build 102 there were two copies of iscsi_protocol.h with only minor differences between them:

usr/src/uts/common/sys/iscsi_protocol.h
usr/src/uts/common/sys/scsi/adapters/iscsi_protocol.h

The version in usr/src/uts/common/sys was used by the iSCSI target daemon.  The version in usr/src/uts/common/sys/scsi/adapters was used by the iSCSI initiator.  The COMSTAR iSCSI target project was retargeting from NWS to ON at the same time and picked up the version in usr/src/uts/common/sys (the team was unaware of the alternate version).  So now there is a third consumer of this file.

These files need to be merged into a single file with the conflicts resolved.
Work Around 
N/A
Comments 
The original location of iscsi_protocol.h in NWS was in src/sun_nws/headers/common/iscsi -- based on the location this file was clearly intended to represent implementation-independent protocol values.  The existing file in ON (which was derived from the original NWS file) also lives in a common area and is clearly intended to be a shared representation of iSCSI protocol values.