Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (204 commits) [SCSI] qla4xxx: export address/port of connection (fix udev disk names) [SCSI] ipr: Fix BUG on adapter dump timeout [SCSI] megaraid_sas: Fix instance access in megasas_reset_timer [SCSI] hpsa: change confusing message to be more clear [SCSI] iscsi class: fix vlan configuration [SCSI] qla4xxx: fix data alignment and use nl helpers [SCSI] iscsi class: fix link local mispelling [SCSI] iscsi class: Replace iscsi_get_next_target_id with IDA [SCSI] aacraid: use lower snprintf() limit [SCSI] lpfc 8.3.27: Change driver version to 8.3.27 [SCSI] lpfc 8.3.27: T10 additions for SLI4 [SCSI] lpfc 8.3.27: Fix queue allocation failure recovery [SCSI] lpfc 8.3.27: Change algorithm for getting physical port name [SCSI] lpfc 8.3.27: Changed worst case mailbox timeout [SCSI] lpfc 8.3.27: Miscellanous logic and interface fixes [SCSI] megaraid_sas: Changelog and version update [SCSI] megaraid_sas: Add driver workaround for PERC5/1068 kdump kernel panic [SCSI] megaraid_sas: Add multiple MSI-X vector/multiple reply queue support [SCSI] megaraid_sas: Add support for MegaRAID 9360/9380 12GB/s controllers [SCSI] megaraid_sas: Clear FUSION_IN_RESET before enabling interrupts ...
This commit is contained in:
@@ -65,16 +65,15 @@ static struct workqueue_struct *fc_exch_workqueue;
|
||||
* assigned range of exchanges to per cpu pool.
|
||||
*/
|
||||
struct fc_exch_pool {
|
||||
spinlock_t lock;
|
||||
struct list_head ex_list;
|
||||
u16 next_index;
|
||||
u16 total_exches;
|
||||
|
||||
/* two cache of free slot in exch array */
|
||||
u16 left;
|
||||
u16 right;
|
||||
|
||||
spinlock_t lock;
|
||||
struct list_head ex_list;
|
||||
};
|
||||
} ____cacheline_aligned_in_smp;
|
||||
|
||||
/**
|
||||
* struct fc_exch_mgr - The Exchange Manager (EM).
|
||||
@@ -91,13 +90,13 @@ struct fc_exch_pool {
|
||||
* It manages the allocation of exchange IDs.
|
||||
*/
|
||||
struct fc_exch_mgr {
|
||||
struct fc_exch_pool *pool;
|
||||
mempool_t *ep_pool;
|
||||
enum fc_class class;
|
||||
struct kref kref;
|
||||
u16 min_xid;
|
||||
u16 max_xid;
|
||||
mempool_t *ep_pool;
|
||||
u16 pool_max_index;
|
||||
struct fc_exch_pool *pool;
|
||||
|
||||
/*
|
||||
* currently exchange mgr stats are updated but not used.
|
||||
|
||||
Reference in New Issue
Block a user