diff options
| author |   Andy Grover <agrover@redhat.com> | 2012-01-19 13:39:11 -0800 |
|---|---|---|
| committer |   Nicholas Bellinger <nab@linux-iscsi.org> | 2012-02-25 14:37:46 -0800 |
| commit | e35fa8c2d0feb977c2f7d14a973b4132483ffef3 (patch) | |
| tree | 51e22df14dcef278c0eb6a3433b06e48a18a6d09 /include/scsi | |
| parent | target: Use #define for SYNCHRONIZE_CACHE_16 (diff) | |
| download | linux-dev-e35fa8c2d0feb977c2f7d14a973b4132483ffef3.tar.xz linux-dev-e35fa8c2d0feb977c2f7d14a973b4132483ffef3.zip | |
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>
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/fc/fc_fcp.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/scsi/fc/fc_fcp.h b/include/scsi/fc/fc_fcp.h index 652dec230514..0d7d67e96d43 100644 --- a/include/scsi/fc/fc_fcp.h +++ b/include/scsi/fc/fc_fcp.h @@ -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 */ |