scsi: Use struct scsi_lun in fc/fcp.h
This allows us to use scsilun_to_int without an ugly cast. Fix up places that use scsilun_to_int on fcp->fc_lun accordingly. In fc target, this leaves ft_cmd.lun unused, so remove it. Signed-off-by: Andy Grover <agrover@redhat.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Kiran Patil <kiran.patil@intel.com> Cc: James Bottomley <JBottomley@Parallels.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:

committed by
Nicholas Bellinger

parent
8e94b8db61
commit
e35fa8c2d0
@@ -20,6 +20,8 @@
|
||||
#ifndef _FC_FCP_H_
|
||||
#define _FC_FCP_H_
|
||||
|
||||
#include <scsi/scsi.h>
|
||||
|
||||
/*
|
||||
* Fibre Channel Protocol for SCSI.
|
||||
* From T10 FCP-3, T10 project 1560-D Rev 4, Sept. 13, 2005.
|
||||
@@ -45,7 +47,7 @@
|
||||
* FCP_CMND IU Payload.
|
||||
*/
|
||||
struct fcp_cmnd {
|
||||
__u8 fc_lun[8]; /* logical unit number */
|
||||
struct scsi_lun fc_lun; /* logical unit number */
|
||||
__u8 fc_cmdref; /* command reference number */
|
||||
__u8 fc_pri_ta; /* priority and task attribute */
|
||||
__u8 fc_tm_flags; /* task management flags */
|
||||
@@ -57,7 +59,7 @@ struct fcp_cmnd {
|
||||
#define FCP_CMND_LEN 32 /* expected length of structure */
|
||||
|
||||
struct fcp_cmnd32 {
|
||||
__u8 fc_lun[8]; /* logical unit number */
|
||||
struct scsi_lun fc_lun; /* logical unit number */
|
||||
__u8 fc_cmdref; /* command reference number */
|
||||
__u8 fc_pri_ta; /* priority and task attribute */
|
||||
__u8 fc_tm_flags; /* task management flags */
|
||||
|
Reference in New Issue
Block a user