Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI updates from James Bottomley: "Updates to the usual drivers (ufs, smartpqi, NCR5380, mac_scsi, lpfc, mpi3mr). There are no user visible core changes and a whole series of minor updates and fixes. The largest core change is probably the simplification of the workqueue allocation path" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (86 commits) scsi: smartpqi: update driver version to 2.1.30-031 scsi: smartpqi: fix volume size updates scsi: smartpqi: fix rare system hang during LUN reset scsi: smartpqi: add new controller PCI IDs scsi: smartpqi: add counter for parity write stream requests scsi: smartpqi: correct stream detection scsi: smartpqi: Add fw log to kdump scsi: bnx2fc: Remove some unused fields in struct bnx2fc_rport scsi: qla2xxx: Remove the unused 'del_list_entry' field in struct fc_port scsi: ufs: core: Remove ufshcd_urgent_bkops() scsi: core: Remove obsoleted declaration for scsi_driverbyte_string() scsi: bnx2i: Remove unused declarations scsi: core: Simplify an alloc_workqueue() invocation scsi: ufs: Simplify alloc*_workqueue() invocation scsi: stex: Simplify an alloc_ordered_workqueue() invocation scsi: scsi_transport_fc: Simplify alloc_workqueue() invocations scsi: snic: Simplify alloc_workqueue() invocations scsi: qedi: Simplify an alloc_workqueue() invocation scsi: qedf: Simplify alloc_workqueue() invocations scsi: myrs: Simplify an alloc_ordered_workqueue() invocation ...
This commit is contained in:
@@ -50,9 +50,7 @@ struct fcoe_ctlr_device {
|
||||
struct fcoe_sysfs_function_template *f;
|
||||
|
||||
struct list_head fcfs;
|
||||
char work_q_name[20];
|
||||
struct workqueue_struct *work_q;
|
||||
char devloss_work_q_name[20];
|
||||
struct workqueue_struct *devloss_work_q;
|
||||
struct mutex lock;
|
||||
|
||||
|
||||
@@ -24,7 +24,6 @@ extern const char *scsi_extd_sense_format(unsigned char, unsigned char,
|
||||
const char **);
|
||||
extern const char *scsi_mlreturn_string(int);
|
||||
extern const char *scsi_hostbyte_string(int);
|
||||
extern const char *scsi_driverbyte_string(int);
|
||||
#else
|
||||
static inline bool
|
||||
scsi_opcode_sa_name(int cmd, int sa,
|
||||
@@ -76,12 +75,6 @@ scsi_hostbyte_string(int result)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline const char *
|
||||
scsi_driverbyte_string(int result)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* _SCSI_SCSI_DBG_H */
|
||||
|
||||
@@ -677,7 +677,6 @@ struct Scsi_Host {
|
||||
/*
|
||||
* Optional work queue to be utilized by the transport
|
||||
*/
|
||||
char work_q_name[20];
|
||||
struct workqueue_struct *work_q;
|
||||
|
||||
/*
|
||||
|
||||
@@ -575,9 +575,7 @@ struct fc_host_attrs {
|
||||
u16 npiv_vports_inuse;
|
||||
|
||||
/* work queues for rport state manipulation */
|
||||
char work_q_name[20];
|
||||
struct workqueue_struct *work_q;
|
||||
char devloss_work_q_name[20];
|
||||
struct workqueue_struct *devloss_work_q;
|
||||
|
||||
/* bsg support */
|
||||
@@ -654,12 +652,8 @@ struct fc_host_attrs {
|
||||
(((struct fc_host_attrs *)(x)->shost_data)->next_vport_number)
|
||||
#define fc_host_npiv_vports_inuse(x) \
|
||||
(((struct fc_host_attrs *)(x)->shost_data)->npiv_vports_inuse)
|
||||
#define fc_host_work_q_name(x) \
|
||||
(((struct fc_host_attrs *)(x)->shost_data)->work_q_name)
|
||||
#define fc_host_work_q(x) \
|
||||
(((struct fc_host_attrs *)(x)->shost_data)->work_q)
|
||||
#define fc_host_devloss_work_q_name(x) \
|
||||
(((struct fc_host_attrs *)(x)->shost_data)->devloss_work_q_name)
|
||||
#define fc_host_devloss_work_q(x) \
|
||||
(((struct fc_host_attrs *)(x)->shost_data)->devloss_work_q)
|
||||
#define fc_host_dev_loss_tmo(x) \
|
||||
|
||||
Reference in New Issue
Block a user