Skip to content

L
linux
Commit 75cc8cfc authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Martin K. Petersen
Browse files
Options

scsi: change FC drivers to use 'struct bsg_job' 

Change FC drivers to use 'struct bsg_job' from bsg-lib.h instead of
'struct fc_bsg_job' from scsi_transport_fc.h and remove 'struct
fc_bsg_job'.
Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Acked-by: default avatarTyrel Datwyler <tyreld@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent bf0f2d38
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 164 deletions
drivers/s390/scsi/zfcp_ext.h
View file @ 75cc8cfc
...@@ -84,8 +84,8 @@ extern void zfcp_fc_link_test_work(struct work_struct *); ...@@ -84,8 +84,8 @@ extern void zfcp_fc_link_test_work(struct work_struct *);
extern void zfcp_fc_wka_ports_force_offline(struct zfcp_fc_wka_ports *); extern void zfcp_fc_wka_ports_force_offline(struct zfcp_fc_wka_ports *);
extern int zfcp_fc_gs_setup(struct zfcp_adapter *); extern int zfcp_fc_gs_setup(struct zfcp_adapter *);
extern void zfcp_fc_gs_destroy(struct zfcp_adapter *); extern void zfcp_fc_gs_destroy(struct zfcp_adapter *);
extern int zfcp_fc_exec_bsg_job(struct fc_bsg_job *); extern int zfcp_fc_exec_bsg_job(struct bsg_job *);
extern int zfcp_fc_timeout_bsg_job(struct fc_bsg_job *); extern int zfcp_fc_timeout_bsg_job(struct bsg_job *);
extern void zfcp_fc_sym_name_update(struct work_struct *); extern void zfcp_fc_sym_name_update(struct work_struct *);
extern unsigned int zfcp_fc_port_scan_backoff(void); extern unsigned int zfcp_fc_port_scan_backoff(void);
extern void zfcp_fc_conditional_port_scan(struct zfcp_adapter *); extern void zfcp_fc_conditional_port_scan(struct zfcp_adapter *);
......
drivers/s390/scsi/zfcp_fc.c
View file @ 75cc8cfc
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/utsname.h> #include <linux/utsname.h>
#include <linux/random.h> #include <linux/random.h>
#include <linux/bsg-lib.h>
#include <scsi/fc/fc_els.h> #include <scsi/fc/fc_els.h>
#include <scsi/libfc.h> #include <scsi/libfc.h>
#include "zfcp_ext.h" #include "zfcp_ext.h"
...@@ -885,7 +886,7 @@ void zfcp_fc_sym_name_update(struct work_struct *work) ...@@ -885,7 +886,7 @@ void zfcp_fc_sym_name_update(struct work_struct *work)
static void zfcp_fc_ct_els_job_handler(void *data) static void zfcp_fc_ct_els_job_handler(void *data)
{ {
struct fc_bsg_job *job = data; struct bsg_job *job = data;
struct zfcp_fsf_ct_els *zfcp_ct_els = job->dd_data; struct zfcp_fsf_ct_els *zfcp_ct_els = job->dd_data;
struct fc_bsg_reply *jr = job->reply; struct fc_bsg_reply *jr = job->reply;
...@@ -895,7 +896,7 @@ static void zfcp_fc_ct_els_job_handler(void *data) ...@@ -895,7 +896,7 @@ static void zfcp_fc_ct_els_job_handler(void *data)
fc_bsg_jobdone(job, jr->result, jr->reply_payload_rcv_len); fc_bsg_jobdone(job, jr->result, jr->reply_payload_rcv_len);
} }
static struct zfcp_fc_wka_port *zfcp_fc_job_wka_port(struct fc_bsg_job *job) static struct zfcp_fc_wka_port *zfcp_fc_job_wka_port(struct bsg_job *job)
{ {
u32 preamble_word1; u32 preamble_word1;
u8 gs_type; u8 gs_type;
...@@ -928,7 +929,7 @@ static struct zfcp_fc_wka_port *zfcp_fc_job_wka_port(struct fc_bsg_job *job) ...@@ -928,7 +929,7 @@ static struct zfcp_fc_wka_port *zfcp_fc_job_wka_port(struct fc_bsg_job *job)
static void zfcp_fc_ct_job_handler(void *data) static void zfcp_fc_ct_job_handler(void *data)
{ {
struct fc_bsg_job *job = data; struct bsg_job *job = data;
struct zfcp_fc_wka_port *wka_port; struct zfcp_fc_wka_port *wka_port;
wka_port = zfcp_fc_job_wka_port(job); wka_port = zfcp_fc_job_wka_port(job);
...@@ -937,7 +938,7 @@ static void zfcp_fc_ct_job_handler(void *data) ...@@ -937,7 +938,7 @@ static void zfcp_fc_ct_job_handler(void *data)
zfcp_fc_ct_els_job_handler(data); zfcp_fc_ct_els_job_handler(data);
} }
static int zfcp_fc_exec_els_job(struct fc_bsg_job *job, static int zfcp_fc_exec_els_job(struct bsg_job *job,
struct zfcp_adapter *adapter) struct zfcp_adapter *adapter)
{ {
struct zfcp_fsf_ct_els *els = job->dd_data; struct zfcp_fsf_ct_els *els = job->dd_data;
...@@ -960,7 +961,7 @@ static int zfcp_fc_exec_els_job(struct fc_bsg_job *job, ...@@ -960,7 +961,7 @@ static int zfcp_fc_exec_els_job(struct fc_bsg_job *job,
return zfcp_fsf_send_els(adapter, d_id, els, job->req->timeout / HZ); return zfcp_fsf_send_els(adapter, d_id, els, job->req->timeout / HZ);
} }
static int zfcp_fc_exec_ct_job(struct fc_bsg_job *job, static int zfcp_fc_exec_ct_job(struct bsg_job *job,
struct zfcp_adapter *adapter) struct zfcp_adapter *adapter)
{ {
int ret; int ret;
...@@ -983,7 +984,7 @@ static int zfcp_fc_exec_ct_job(struct fc_bsg_job *job, ...@@ -983,7 +984,7 @@ static int zfcp_fc_exec_ct_job(struct fc_bsg_job *job,
return ret; return ret;
} }
int zfcp_fc_exec_bsg_job(struct fc_bsg_job *job) int zfcp_fc_exec_bsg_job(struct bsg_job *job)
{ {
struct Scsi_Host *shost; struct Scsi_Host *shost;
struct zfcp_adapter *adapter; struct zfcp_adapter *adapter;
...@@ -1013,7 +1014,7 @@ int zfcp_fc_exec_bsg_job(struct fc_bsg_job *job) ...@@ -1013,7 +1014,7 @@ int zfcp_fc_exec_bsg_job(struct fc_bsg_job *job)
} }
} }
int zfcp_fc_timeout_bsg_job(struct fc_bsg_job *job) int zfcp_fc_timeout_bsg_job(struct bsg_job *job)
{ {
/* hardware tracks timeout, reset bsg timeout to not interfere */ /* hardware tracks timeout, reset bsg timeout to not interfere */
return -EAGAIN; return -EAGAIN;
......
drivers/scsi/bfa/bfad_bsg.c
View file @ 75cc8cfc
...@@ -3130,7 +3130,7 @@ bfad_iocmd_handler(struct bfad_s *bfad, unsigned int cmd, void *iocmd, ...@@ -3130,7 +3130,7 @@ bfad_iocmd_handler(struct bfad_s *bfad, unsigned int cmd, void *iocmd,
} }
static int static int
bfad_im_bsg_vendor_request(struct fc_bsg_job *job) bfad_im_bsg_vendor_request(struct bsg_job *job)
{ {
struct fc_bsg_request *bsg_request = job->request; struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply; struct fc_bsg_reply *bsg_reply = job->reply;
...@@ -3314,7 +3314,7 @@ bfad_fcxp_free_mem(struct bfad_s *bfad, struct bfad_buf_info *buf_base, ...@@ -3314,7 +3314,7 @@ bfad_fcxp_free_mem(struct bfad_s *bfad, struct bfad_buf_info *buf_base,
} }
int int
bfad_fcxp_bsg_send(struct fc_bsg_job *job, struct bfad_fcxp *drv_fcxp, bfad_fcxp_bsg_send(struct bsg_job *job, struct bfad_fcxp *drv_fcxp,
bfa_bsg_fcpt_t *bsg_fcpt) bfa_bsg_fcpt_t *bsg_fcpt)
{ {
struct bfa_fcxp_s *hal_fcxp; struct bfa_fcxp_s *hal_fcxp;
...@@ -3354,7 +3354,7 @@ bfad_fcxp_bsg_send(struct fc_bsg_job *job, struct bfad_fcxp *drv_fcxp, ...@@ -3354,7 +3354,7 @@ bfad_fcxp_bsg_send(struct fc_bsg_job *job, struct bfad_fcxp *drv_fcxp,
} }
int int
bfad_im_bsg_els_ct_request(struct fc_bsg_job *job) bfad_im_bsg_els_ct_request(struct bsg_job *job)
{ {
struct bfa_bsg_data *bsg_data; struct bfa_bsg_data *bsg_data;
struct bfad_im_port_s *im_port = shost_priv(fc_bsg_to_shost(job)); struct bfad_im_port_s *im_port = shost_priv(fc_bsg_to_shost(job));
...@@ -3562,7 +3562,7 @@ bfad_im_bsg_els_ct_request(struct fc_bsg_job *job) ...@@ -3562,7 +3562,7 @@ bfad_im_bsg_els_ct_request(struct fc_bsg_job *job)
} }
int int
bfad_im_bsg_request(struct fc_bsg_job *job) bfad_im_bsg_request(struct bsg_job *job)
{ {
struct fc_bsg_request *bsg_request = job->request; struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply; struct fc_bsg_reply *bsg_reply = job->reply;
...@@ -3590,7 +3590,7 @@ bfad_im_bsg_request(struct fc_bsg_job *job) ...@@ -3590,7 +3590,7 @@ bfad_im_bsg_request(struct fc_bsg_job *job)
} }
int int
bfad_im_bsg_timeout(struct fc_bsg_job *job) bfad_im_bsg_timeout(struct bsg_job *job)
{ {
/* Don't complete the BSG job request - return -EAGAIN /* Don't complete the BSG job request - return -EAGAIN
* to reset bsg job timeout : for ELS/CT pass thru we * to reset bsg job timeout : for ELS/CT pass thru we
......
drivers/scsi/bfa/bfad_im.h
View file @ 75cc8cfc
...@@ -166,8 +166,8 @@ extern struct device_attribute *bfad_im_vport_attrs[]; ...@@ -166,8 +166,8 @@ extern struct device_attribute *bfad_im_vport_attrs[];
irqreturn_t bfad_intx(int irq, void *dev_id); irqreturn_t bfad_intx(int irq, void *dev_id);
int bfad_im_bsg_request(struct fc_bsg_job *job); int bfad_im_bsg_request(struct bsg_job *job);
int bfad_im_bsg_timeout(struct fc_bsg_job *job); int bfad_im_bsg_timeout(struct bsg_job *job);
/* /*
* Macro to set the SCSI device sdev_bflags - sdev_bflags are used by the * Macro to set the SCSI device sdev_bflags - sdev_bflags are used by the
......
drivers/scsi/ibmvscsi/ibmvfc.c
View file @ 75cc8cfc
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/stringify.h> #include <linux/stringify.h>
#include <linux/bsg-lib.h>
#include <asm/firmware.h> #include <asm/firmware.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/vio.h> #include <asm/vio.h>
...@@ -1701,12 +1702,12 @@ static void ibmvfc_bsg_timeout_done(struct ibmvfc_event *evt) ...@@ -1701,12 +1702,12 @@ static void ibmvfc_bsg_timeout_done(struct ibmvfc_event *evt)
/** /**
* ibmvfc_bsg_timeout - Handle a BSG timeout * ibmvfc_bsg_timeout - Handle a BSG timeout
* @job: struct fc_bsg_job that timed out * @job: struct bsg_job that timed out
* *
* Returns: * Returns:
* 0 on success / other on failure * 0 on success / other on failure
**/ **/
static int ibmvfc_bsg_timeout(struct fc_bsg_job *job) static int ibmvfc_bsg_timeout(struct bsg_job *job)
{ {
struct ibmvfc_host *vhost = shost_priv(fc_bsg_to_shost(job)); struct ibmvfc_host *vhost = shost_priv(fc_bsg_to_shost(job));
unsigned long port_id = (unsigned long)job->dd_data; unsigned long port_id = (unsigned long)job->dd_data;
...@@ -1814,12 +1815,12 @@ static int ibmvfc_bsg_plogi(struct ibmvfc_host *vhost, unsigned int port_id) ...@@ -1814,12 +1815,12 @@ static int ibmvfc_bsg_plogi(struct ibmvfc_host *vhost, unsigned int port_id)
/** /**
* ibmvfc_bsg_request - Handle a BSG request * ibmvfc_bsg_request - Handle a BSG request
* @job: struct fc_bsg_job to be executed * @job: struct bsg_job to be executed
* *
* Returns: * Returns:
* 0 on success / other on failure * 0 on success / other on failure
**/ **/
static int ibmvfc_bsg_request(struct fc_bsg_job *job) static int ibmvfc_bsg_request(struct bsg_job *job)
{ {
struct ibmvfc_host *vhost = shost_priv(fc_bsg_to_shost(job)); struct ibmvfc_host *vhost = shost_priv(fc_bsg_to_shost(job));
struct fc_rport *rport = fc_bsg_to_rport(job); struct fc_rport *rport = fc_bsg_to_rport(job);
......
drivers/scsi/libfc/fc_lport.c
View file @ 75cc8cfc
...@@ -149,7 +149,7 @@ static const char *fc_lport_state_names[] = { ...@@ -149,7 +149,7 @@ static const char *fc_lport_state_names[] = {
* @offset: The offset into the response data * @offset: The offset into the response data
*/ */
struct fc_bsg_info { struct fc_bsg_info {
struct fc_bsg_job *job; struct bsg_job *job;
struct fc_lport *lport; struct fc_lport *lport;
u16 rsp_code; u16 rsp_code;
struct scatterlist *sg; struct scatterlist *sg;
...@@ -1901,7 +1901,7 @@ static void fc_lport_bsg_resp(struct fc_seq *sp, struct fc_frame *fp, ...@@ -1901,7 +1901,7 @@ static void fc_lport_bsg_resp(struct fc_seq *sp, struct fc_frame *fp,
void *info_arg) void *info_arg)
{ {
struct fc_bsg_info *info = info_arg; struct fc_bsg_info *info = info_arg;
struct fc_bsg_job *job = info->job; struct bsg_job *job = info->job;
struct fc_bsg_reply *bsg_reply = job->reply; struct fc_bsg_reply *bsg_reply = job->reply;
struct fc_lport *lport = info->lport; struct fc_lport *lport = info->lport;
struct fc_frame_header *fh; struct fc_frame_header *fh;
...@@ -1964,7 +1964,7 @@ static void fc_lport_bsg_resp(struct fc_seq *sp, struct fc_frame *fp, ...@@ -1964,7 +1964,7 @@ static void fc_lport_bsg_resp(struct fc_seq *sp, struct fc_frame *fp,
* Locking Note: The lport lock is expected to be held before calling * Locking Note: The lport lock is expected to be held before calling
* this routine. * this routine.
*/ */
static int fc_lport_els_request(struct fc_bsg_job *job, static int fc_lport_els_request(struct bsg_job *job,
struct fc_lport *lport, struct fc_lport *lport,
u32 did, u32 tov) u32 did, u32 tov)
{ {
...@@ -2025,7 +2025,7 @@ static int fc_lport_els_request(struct fc_bsg_job *job, ...@@ -2025,7 +2025,7 @@ static int fc_lport_els_request(struct fc_bsg_job *job,
* Locking Note: The lport lock is expected to be held before calling * Locking Note: The lport lock is expected to be held before calling
* this routine. * this routine.
*/ */
static int fc_lport_ct_request(struct fc_bsg_job *job, static int fc_lport_ct_request(struct bsg_job *job,
struct fc_lport *lport, u32 did, u32 tov) struct fc_lport *lport, u32 did, u32 tov)
{ {
struct fc_bsg_info *info; struct fc_bsg_info *info;
...@@ -2081,7 +2081,7 @@ static int fc_lport_ct_request(struct fc_bsg_job *job, ...@@ -2081,7 +2081,7 @@ static int fc_lport_ct_request(struct fc_bsg_job *job,
* FC Passthrough requests * FC Passthrough requests
* @job: The BSG passthrough job * @job: The BSG passthrough job
*/ */
int fc_lport_bsg_request(struct fc_bsg_job *job) int fc_lport_bsg_request(struct bsg_job *job)
{ {
struct fc_bsg_request *bsg_request = job->request; struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply; struct fc_bsg_reply *bsg_reply = job->reply;
......
drivers/scsi/lpfc/lpfc_bsg.c
View file @ 75cc8cfc
This diff is collapsed.
drivers/scsi/lpfc/lpfc_crtn.h
View file @ 75cc8cfc
...@@ -429,8 +429,8 @@ struct lpfc_sglq *__lpfc_get_active_sglq(struct lpfc_hba *, uint16_t); ...@@ -429,8 +429,8 @@ struct lpfc_sglq *__lpfc_get_active_sglq(struct lpfc_hba *, uint16_t);
#define HBA_EVENT_LINK_DOWN 3 #define HBA_EVENT_LINK_DOWN 3
/* functions to support SGIOv4/bsg interface */ /* functions to support SGIOv4/bsg interface */
int lpfc_bsg_request(struct fc_bsg_job *); int lpfc_bsg_request(struct bsg_job *);
int lpfc_bsg_timeout(struct fc_bsg_job *); int lpfc_bsg_timeout(struct bsg_job *);
int lpfc_bsg_ct_unsol_event(struct lpfc_hba *, struct lpfc_sli_ring *, int lpfc_bsg_ct_unsol_event(struct lpfc_hba *, struct lpfc_sli_ring *,
struct lpfc_iocbq *); struct lpfc_iocbq *);
int lpfc_bsg_ct_unsol_abort(struct lpfc_hba *, struct hbq_dmabuf *); int lpfc_bsg_ct_unsol_abort(struct lpfc_hba *, struct hbq_dmabuf *);
......
drivers/scsi/qla2xxx/qla_bsg.c
View file @ 75cc8cfc
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/bsg-lib.h>
/* BSG support for ELS/CT pass through */ /* BSG support for ELS/CT pass through */
void void
...@@ -16,7 +17,7 @@ qla2x00_bsg_job_done(void *data, void *ptr, int res) ...@@ -16,7 +17,7 @@ qla2x00_bsg_job_done(void *data, void *ptr, int res)
{ {
srb_t *sp = (srb_t *)ptr; srb_t *sp = (srb_t *)ptr;
struct scsi_qla_host *vha = (scsi_qla_host_t *)data; struct scsi_qla_host *vha = (scsi_qla_host_t *)data;
struct fc_bsg_job *bsg_job = sp->u.bsg_job; struct bsg_job *bsg_job = sp->u.bsg_job;
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
bsg_reply->result = res; bsg_reply->result = res;
...@@ -30,7 +31,7 @@ qla2x00_bsg_sp_free(void *data, void *ptr) ...@@ -30,7 +31,7 @@ qla2x00_bsg_sp_free(void *data, void *ptr)
{ {
srb_t *sp = (srb_t *)ptr; srb_t *sp = (srb_t *)ptr;
struct scsi_qla_host *vha = sp->fcport->vha; struct scsi_qla_host *vha = sp->fcport->vha;
struct fc_bsg_job *bsg_job = sp->u.bsg_job; struct bsg_job *bsg_job = sp->u.bsg_job;
struct fc_bsg_request *bsg_request = bsg_job->request; struct fc_bsg_request *bsg_request = bsg_job->request;
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
...@@ -120,7 +121,7 @@ qla24xx_fcp_prio_cfg_valid(scsi_qla_host_t *vha, ...@@ -120,7 +121,7 @@ qla24xx_fcp_prio_cfg_valid(scsi_qla_host_t *vha,
} }
static int static int
qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job) qla24xx_proc_fcp_prio_cfg_cmd(struct bsg_job *bsg_job)
{ {
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
struct fc_bsg_request *bsg_request = bsg_job->request; struct fc_bsg_request *bsg_request = bsg_job->request;
...@@ -249,7 +250,7 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job) ...@@ -249,7 +250,7 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
} }
static int static int
qla2x00_process_els(struct fc_bsg_job *bsg_job) qla2x00_process_els(struct bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request; struct fc_bsg_request *bsg_request = bsg_job->request;
struct fc_rport *rport; struct fc_rport *rport;
...@@ -428,7 +429,7 @@ qla24xx_calc_ct_iocbs(uint16_t dsds) ...@@ -428,7 +429,7 @@ qla24xx_calc_ct_iocbs(uint16_t dsds)
} }
static int static int
qla2x00_process_ct(struct fc_bsg_job *bsg_job) qla2x00_process_ct(struct bsg_job *bsg_job)
{ {
srb_t *sp; srb_t *sp;
struct fc_bsg_request *bsg_request = bsg_job->request; struct fc_bsg_request *bsg_request = bsg_job->request;
...@@ -706,7 +707,7 @@ qla81xx_set_loopback_mode(scsi_qla_host_t *vha, uint16_t *config, ...@@ -706,7 +707,7 @@ qla81xx_set_loopback_mode(scsi_qla_host_t *vha, uint16_t *config,
} }
static int static int
qla2x00_process_loopback(struct fc_bsg_job *bsg_job) qla2x00_process_loopback(struct bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request; struct fc_bsg_request *bsg_request = bsg_job->request;
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
...@@ -947,7 +948,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job) ...@@ -947,7 +948,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
} }
static int static int
qla84xx_reset(struct fc_bsg_job *bsg_job) qla84xx_reset(struct bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request; struct fc_bsg_request *bsg_request = bsg_job->request;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -983,7 +984,7 @@ qla84xx_reset(struct fc_bsg_job *bsg_job) ...@@ -983,7 +984,7 @@ qla84xx_reset(struct fc_bsg_job *bsg_job)
} }
static int static int
qla84xx_updatefw(struct fc_bsg_job *bsg_job) qla84xx_updatefw(struct bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request; struct fc_bsg_request *bsg_request = bsg_job->request;
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
...@@ -1095,7 +1096,7 @@ qla84xx_updatefw(struct fc_bsg_job *bsg_job) ...@@ -1095,7 +1096,7 @@ qla84xx_updatefw(struct fc_bsg_job *bsg_job)
} }
static int static int
qla84xx_mgmt_cmd(struct fc_bsg_job *bsg_job) qla84xx_mgmt_cmd(struct bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request; struct fc_bsg_request *bsg_request = bsg_job->request;
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
...@@ -1293,7 +1294,7 @@ qla84xx_mgmt_cmd(struct fc_bsg_job *bsg_job) ...@@ -1293,7 +1294,7 @@ qla84xx_mgmt_cmd(struct fc_bsg_job *bsg_job)
} }
static int static int
qla24xx_iidma(struct fc_bsg_job *bsg_job) qla24xx_iidma(struct bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request; struct fc_bsg_request *bsg_request = bsg_job->request;
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
...@@ -1382,7 +1383,7 @@ qla24xx_iidma(struct fc_bsg_job *bsg_job) ...@@ -1382,7 +1383,7 @@ qla24xx_iidma(struct fc_bsg_job *bsg_job)
} }
static int static int
qla2x00_optrom_setup(struct fc_bsg_job *bsg_job, scsi_qla_host_t *vha, qla2x00_optrom_setup(struct bsg_job *bsg_job, scsi_qla_host_t *vha,
uint8_t is_update) uint8_t is_update)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request; struct fc_bsg_request *bsg_request = bsg_job->request;
...@@ -1452,7 +1453,7 @@ qla2x00_optrom_setup(struct fc_bsg_job *bsg_job, scsi_qla_host_t *vha, ...@@ -1452,7 +1453,7 @@ qla2x00_optrom_setup(struct fc_bsg_job *bsg_job, scsi_qla_host_t *vha,
} }
static int static int
qla2x00_read_optrom(struct fc_bsg_job *bsg_job) qla2x00_read_optrom(struct bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -1489,7 +1490,7 @@ qla2x00_read_optrom(struct fc_bsg_job *bsg_job) ...@@ -1489,7 +1490,7 @@ qla2x00_read_optrom(struct fc_bsg_job *bsg_job)
} }
static int static int
qla2x00_update_optrom(struct fc_bsg_job *bsg_job) qla2x00_update_optrom(struct bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -1525,7 +1526,7 @@ qla2x00_update_optrom(struct fc_bsg_job *bsg_job) ...@@ -1525,7 +1526,7 @@ qla2x00_update_optrom(struct fc_bsg_job *bsg_job)
} }
static int static int
qla2x00_update_fru_versions(struct fc_bsg_job *bsg_job) qla2x00_update_fru_versions(struct bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -1577,7 +1578,7 @@ qla2x00_update_fru_versions(struct fc_bsg_job *bsg_job) ...@@ -1577,7 +1578,7 @@ qla2x00_update_fru_versions(struct fc_bsg_job *bsg_job)
} }
static int static int
qla2x00_read_fru_status(struct fc_bsg_job *bsg_job) qla2x00_read_fru_status(struct bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -1627,7 +1628,7 @@ qla2x00_read_fru_status(struct fc_bsg_job *bsg_job) ...@@ -1627,7 +1628,7 @@ qla2x00_read_fru_status(struct fc_bsg_job *bsg_job)
} }
static int static int
qla2x00_write_fru_status(struct fc_bsg_job *bsg_job) qla2x00_write_fru_status(struct bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -1673,7 +1674,7 @@ qla2x00_write_fru_status(struct fc_bsg_job *bsg_job) ...@@ -1673,7 +1674,7 @@ qla2x00_write_fru_status(struct fc_bsg_job *bsg_job)
} }
static int static int
qla2x00_write_i2c(struct fc_bsg_job *bsg_job) qla2x00_write_i2c(struct bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -1718,7 +1719,7 @@ qla2x00_write_i2c(struct fc_bsg_job *bsg_job) ...@@ -1718,7 +1719,7 @@ qla2x00_write_i2c(struct fc_bsg_job *bsg_job)
} }
static int static int
qla2x00_read_i2c(struct fc_bsg_job *bsg_job) qla2x00_read_i2c(struct bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -1767,7 +1768,7 @@ qla2x00_read_i2c(struct fc_bsg_job *bsg_job) ...@@ -1767,7 +1768,7 @@ qla2x00_read_i2c(struct fc_bsg_job *bsg_job)
} }
static int static int
qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job) qla24xx_process_bidir_cmd(struct bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -1946,7 +1947,7 @@ qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job) ...@@ -1946,7 +1947,7 @@ qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job)
} }
static int static int
qlafx00_mgmt_cmd(struct fc_bsg_job *bsg_job) qlafx00_mgmt_cmd(struct bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request; struct fc_bsg_request *bsg_request = bsg_job->request;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -2069,7 +2070,7 @@ qlafx00_mgmt_cmd(struct fc_bsg_job *bsg_job) ...@@ -2069,7 +2070,7 @@ qlafx00_mgmt_cmd(struct fc_bsg_job *bsg_job)
} }
static int static int
qla26xx_serdes_op(struct fc_bsg_job *bsg_job) qla26xx_serdes_op(struct bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -2111,7 +2112,7 @@ qla26xx_serdes_op(struct fc_bsg_job *bsg_job) ...@@ -2111,7 +2112,7 @@ qla26xx_serdes_op(struct fc_bsg_job *bsg_job)
} }
static int static int
qla8044_serdes_op(struct fc_bsg_job *bsg_job) qla8044_serdes_op(struct bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -2153,7 +2154,7 @@ qla8044_serdes_op(struct fc_bsg_job *bsg_job) ...@@ -2153,7 +2154,7 @@ qla8044_serdes_op(struct fc_bsg_job *bsg_job)
} }
static int static int
qla27xx_get_flash_upd_cap(struct fc_bsg_job *bsg_job) qla27xx_get_flash_upd_cap(struct bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -2185,7 +2186,7 @@ qla27xx_get_flash_upd_cap(struct fc_bsg_job *bsg_job) ...@@ -2185,7 +2186,7 @@ qla27xx_get_flash_upd_cap(struct fc_bsg_job *bsg_job)
} }
static int static int
qla27xx_set_flash_upd_cap(struct fc_bsg_job *bsg_job) qla27xx_set_flash_upd_cap(struct bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -2231,7 +2232,7 @@ qla27xx_set_flash_upd_cap(struct fc_bsg_job *bsg_job) ...@@ -2231,7 +2232,7 @@ qla27xx_set_flash_upd_cap(struct fc_bsg_job *bsg_job)
} }
static int static int
qla27xx_get_bbcr_data(struct fc_bsg_job *bsg_job) qla27xx_get_bbcr_data(struct bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -2290,7 +2291,7 @@ qla27xx_get_bbcr_data(struct fc_bsg_job *bsg_job) ...@@ -2290,7 +2291,7 @@ qla27xx_get_bbcr_data(struct fc_bsg_job *bsg_job)
} }
static int static int
qla2x00_get_priv_stats(struct fc_bsg_job *bsg_job) qla2x00_get_priv_stats(struct bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request; struct fc_bsg_request *bsg_request = bsg_job->request;
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
...@@ -2351,7 +2352,7 @@ qla2x00_get_priv_stats(struct fc_bsg_job *bsg_job) ...@@ -2351,7 +2352,7 @@ qla2x00_get_priv_stats(struct fc_bsg_job *bsg_job)
} }
static int static int
qla2x00_do_dport_diagnostics(struct fc_bsg_job *bsg_job) qla2x00_do_dport_diagnostics(struct bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = fc_bsg_to_shost(bsg_job); struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
...@@ -2394,7 +2395,7 @@ qla2x00_do_dport_diagnostics(struct fc_bsg_job *bsg_job) ...@@ -2394,7 +2395,7 @@ qla2x00_do_dport_diagnostics(struct fc_bsg_job *bsg_job)
} }
static int static int
qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job) qla2x00_process_vendor_specific(struct bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request; struct fc_bsg_request *bsg_request = bsg_job->request;
...@@ -2472,7 +2473,7 @@ qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job) ...@@ -2472,7 +2473,7 @@ qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)
} }
int int
qla24xx_bsg_request(struct fc_bsg_job *bsg_job) qla24xx_bsg_request(struct bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request; struct fc_bsg_request *bsg_request = bsg_job->request;
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
...@@ -2525,7 +2526,7 @@ qla24xx_bsg_request(struct fc_bsg_job *bsg_job) ...@@ -2525,7 +2526,7 @@ qla24xx_bsg_request(struct fc_bsg_job *bsg_job)
} }
int int
qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job) qla24xx_bsg_timeout(struct bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply; struct fc_bsg_reply *bsg_reply = bsg_job->reply;
scsi_qla_host_t *vha = shost_priv(fc_bsg_to_shost(bsg_job)); scsi_qla_host_t *vha = shost_priv(fc_bsg_to_shost(bsg_job));
......
drivers/scsi/qla2xxx/qla_def.h
View file @ 75cc8cfc
...@@ -403,7 +403,7 @@ typedef struct srb { ...@@ -403,7 +403,7 @@ typedef struct srb {
int iocbs; int iocbs;
union { union {
struct srb_iocb iocb_cmd; struct srb_iocb iocb_cmd;
struct fc_bsg_job *bsg_job; struct bsg_job *bsg_job;
struct srb_cmd scmd; struct srb_cmd scmd;
} u; } u;
void (*done)(void *, void *, int); void (*done)(void *, void *, int);
......
drivers/scsi/qla2xxx/qla_gbl.h
View file @ 75cc8cfc
...@@ -733,8 +733,8 @@ extern int qla82xx_read_temperature(scsi_qla_host_t *); ...@@ -733,8 +733,8 @@ extern int qla82xx_read_temperature(scsi_qla_host_t *);
extern int qla8044_read_temperature(scsi_qla_host_t *); extern int qla8044_read_temperature(scsi_qla_host_t *);
/* BSG related functions */ /* BSG related functions */
extern int qla24xx_bsg_request(struct fc_bsg_job *); extern int qla24xx_bsg_request(struct bsg_job *);
extern int qla24xx_bsg_timeout(struct fc_bsg_job *); extern int qla24xx_bsg_timeout(struct bsg_job *);
extern int qla84xx_reset_chip(scsi_qla_host_t *, uint16_t); extern int qla84xx_reset_chip(scsi_qla_host_t *, uint16_t);
extern int qla2x00_issue_iocb_timeout(scsi_qla_host_t *, void *, extern int qla2x00_issue_iocb_timeout(scsi_qla_host_t *, void *,
dma_addr_t, size_t, uint32_t); dma_addr_t, size_t, uint32_t);
......
drivers/scsi/qla2xxx/qla_iocb.c
View file @ 75cc8cfc
...@@ -2197,7 +2197,7 @@ qla24xx_els_logo_iocb(srb_t *sp, struct els_entry_24xx *els_iocb) ...@@ -2197,7 +2197,7 @@ qla24xx_els_logo_iocb(srb_t *sp, struct els_entry_24xx *els_iocb)
static void static void
qla24xx_els_iocb(srb_t *sp, struct els_entry_24xx *els_iocb) qla24xx_els_iocb(srb_t *sp, struct els_entry_24xx *els_iocb)
{ {
struct fc_bsg_job *bsg_job = sp->u.bsg_job; struct bsg_job *bsg_job = sp->u.bsg_job;
struct fc_bsg_request *bsg_request = bsg_job->request; struct fc_bsg_request *bsg_request = bsg_job->request;
els_iocb->entry_type = ELS_IOCB_TYPE; els_iocb->entry_type = ELS_IOCB_TYPE;
...@@ -2251,7 +2251,7 @@ qla2x00_ct_iocb(srb_t *sp, ms_iocb_entry_t *ct_iocb) ...@@ -2251,7 +2251,7 @@ qla2x00_ct_iocb(srb_t *sp, ms_iocb_entry_t *ct_iocb)
uint16_t tot_dsds; uint16_t tot_dsds;
scsi_qla_host_t *vha = sp->fcport->vha; scsi_qla_host_t *vha = sp->fcport->vha;
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
struct fc_bsg_job *bsg_job = sp->u.bsg_job; struct bsg_job *bsg_job = sp->u.bsg_job;
int loop_iterartion = 0; int loop_iterartion = 0;
int entry_count = 1; int entry_count = 1;
...@@ -2328,7 +2328,7 @@ qla24xx_ct_iocb(srb_t *sp, struct ct_entry_24xx *ct_iocb) ...@@ -2328,7 +2328,7 @@ qla24xx_ct_iocb(srb_t *sp, struct ct_entry_24xx *ct_iocb)
uint16_t tot_dsds; uint16_t tot_dsds;
scsi_qla_host_t *vha = sp->fcport->vha; scsi_qla_host_t *vha = sp->fcport->vha;
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
struct fc_bsg_job *bsg_job = sp->u.bsg_job; struct bsg_job *bsg_job = sp->u.bsg_job;
int loop_iterartion = 0; int loop_iterartion = 0;
int entry_count = 1; int entry_count = 1;
...@@ -2834,7 +2834,7 @@ qla25xx_build_bidir_iocb(srb_t *sp, struct scsi_qla_host *vha, ...@@ -2834,7 +2834,7 @@ qla25xx_build_bidir_iocb(srb_t *sp, struct scsi_qla_host *vha,
struct scatterlist *sg; struct scatterlist *sg;
int index; int index;
int entry_count = 1; int entry_count = 1;
struct fc_bsg_job *bsg_job = sp->u.bsg_job; struct bsg_job *bsg_job = sp->u.bsg_job;
/*Update entry type to indicate bidir command */ /*Update entry type to indicate bidir command */
*((uint32_t *)(&cmd_pkt->entry_type)) = *((uint32_t *)(&cmd_pkt->entry_type)) =
......
drivers/scsi/qla2xxx/qla_isr.c
View file @ 75cc8cfc
...@@ -1356,7 +1356,7 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req, ...@@ -1356,7 +1356,7 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
const char func[] = "CT_IOCB"; const char func[] = "CT_IOCB";
const char *type; const char *type;
srb_t *sp; srb_t *sp;
struct fc_bsg_job *bsg_job; struct bsg_job *bsg_job;
struct fc_bsg_reply *bsg_reply; struct fc_bsg_reply *bsg_reply;
uint16_t comp_status; uint16_t comp_status;
int res; int res;
...@@ -1415,7 +1415,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req, ...@@ -1415,7 +1415,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
const char func[] = "ELS_CT_IOCB"; const char func[] = "ELS_CT_IOCB";
const char *type; const char *type;
srb_t *sp; srb_t *sp;
struct fc_bsg_job *bsg_job; struct bsg_job *bsg_job;
struct fc_bsg_reply *bsg_reply; struct fc_bsg_reply *bsg_reply;
uint16_t comp_status; uint16_t comp_status;
uint32_t fw_status[3]; uint32_t fw_status[3];
...@@ -1908,7 +1908,7 @@ qla25xx_process_bidir_status_iocb(scsi_qla_host_t *vha, void *pkt, ...@@ -1908,7 +1908,7 @@ qla25xx_process_bidir_status_iocb(scsi_qla_host_t *vha, void *pkt,
uint16_t scsi_status; uint16_t scsi_status;
uint16_t thread_id; uint16_t thread_id;
uint32_t rval = EXT_STATUS_OK; uint32_t rval = EXT_STATUS_OK;
struct fc_bsg_job *bsg_job = NULL; struct bsg_job *bsg_job = NULL;
struct fc_bsg_request *bsg_request; struct fc_bsg_request *bsg_request;
struct fc_bsg_reply *bsg_reply; struct fc_bsg_reply *bsg_reply;
sts_entry_t *sts; sts_entry_t *sts;
......
drivers/scsi/qla2xxx/qla_mr.c
View file @ 75cc8cfc
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/bsg-lib.h>
#include <scsi/scsi_tcq.h> #include <scsi/scsi_tcq.h>
#include <linux/utsname.h> #include <linux/utsname.h>
...@@ -2206,7 +2207,7 @@ qlafx00_ioctl_iosb_entry(scsi_qla_host_t *vha, struct req_que *req, ...@@ -2206,7 +2207,7 @@ qlafx00_ioctl_iosb_entry(scsi_qla_host_t *vha, struct req_que *req,
{ {
const char func[] = "IOSB_IOCB"; const char func[] = "IOSB_IOCB";
srb_t *sp; srb_t *sp;
struct fc_bsg_job *bsg_job; struct bsg_job *bsg_job;
struct fc_bsg_reply *bsg_reply; struct fc_bsg_reply *bsg_reply;
struct srb_iocb *iocb_job; struct srb_iocb *iocb_job;
int res; int res;
...@@ -3254,7 +3255,7 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb) ...@@ -3254,7 +3255,7 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb)
{ {
struct srb_iocb *fxio = &sp->u.iocb_cmd; struct srb_iocb *fxio = &sp->u.iocb_cmd;
struct qla_mt_iocb_rqst_fx00 *piocb_rqst; struct qla_mt_iocb_rqst_fx00 *piocb_rqst;
struct fc_bsg_job *bsg_job; struct bsg_job *bsg_job;
struct fc_bsg_request *bsg_request; struct fc_bsg_request *bsg_request;
struct fxdisc_entry_fx00 fx_iocb; struct fxdisc_entry_fx00 fx_iocb;
uint8_t entry_cnt = 1; uint8_t entry_cnt = 1;
......
drivers/scsi/scsi_transport_fc.c
View file @ 75cc8cfc
...@@ -3562,7 +3562,7 @@ fc_vport_sched_delete(struct work_struct *work) ...@@ -3562,7 +3562,7 @@ fc_vport_sched_delete(struct work_struct *work)
static void static void
fc_destroy_bsgjob(struct kref *kref) fc_destroy_bsgjob(struct kref *kref)
{ {
struct fc_bsg_job *job = container_of(kref, struct fc_bsg_job, kref); struct bsg_job *job = container_of(kref, struct bsg_job, kref);
struct request *rq = job->req; struct request *rq = job->req;
blk_end_request_all(rq, rq->errors); blk_end_request_all(rq, rq->errors);
...@@ -3581,7 +3581,7 @@ fc_destroy_bsgjob(struct kref *kref) ...@@ -3581,7 +3581,7 @@ fc_destroy_bsgjob(struct kref *kref)
* @result: job reply result * @result: job reply result
* @reply_payload_rcv_len: length of payload received * @reply_payload_rcv_len: length of payload received
*/ */
void fc_bsg_jobdone(struct fc_bsg_job *job, int result, void fc_bsg_jobdone(struct bsg_job *job, int result,
unsigned int reply_payload_rcv_len) unsigned int reply_payload_rcv_len)
{ {
struct request *req = job->req; struct request *req = job->req;
...@@ -3615,7 +3615,7 @@ EXPORT_SYMBOL_GPL(fc_bsg_jobdone); ...@@ -3615,7 +3615,7 @@ EXPORT_SYMBOL_GPL(fc_bsg_jobdone);
*/ */
static void fc_bsg_softirq_done(struct request *rq) static void fc_bsg_softirq_done(struct request *rq)
{ {
struct fc_bsg_job *job = rq->special; struct bsg_job *job = rq->special;
kref_put(&job->kref, fc_destroy_bsgjob); kref_put(&job->kref, fc_destroy_bsgjob);
} }
...@@ -3627,7 +3627,7 @@ static void fc_bsg_softirq_done(struct request *rq) ...@@ -3627,7 +3627,7 @@ static void fc_bsg_softirq_done(struct request *rq)
static enum blk_eh_timer_return static enum blk_eh_timer_return
fc_bsg_job_timeout(struct request *req) fc_bsg_job_timeout(struct request *req)
{ {
struct fc_bsg_job *job = (void *) req->special; struct bsg_job *job = (void *) req->special;
struct Scsi_Host *shost = fc_bsg_to_shost(job); struct Scsi_Host *shost = fc_bsg_to_shost(job);
struct fc_rport *rport = fc_bsg_to_rport(job); struct fc_rport *rport = fc_bsg_to_rport(job);
struct fc_internal *i = to_fc_internal(shost->transportt); struct fc_internal *i = to_fc_internal(shost->transportt);
...@@ -3686,12 +3686,12 @@ fc_req_to_bsgjob(struct Scsi_Host *shost, struct fc_rport *rport, ...@@ -3686,12 +3686,12 @@ fc_req_to_bsgjob(struct Scsi_Host *shost, struct fc_rport *rport,
{ {
struct fc_internal *i = to_fc_internal(shost->transportt); struct fc_internal *i = to_fc_internal(shost->transportt);
struct request *rsp = req->next_rq; struct request *rsp = req->next_rq;
struct fc_bsg_job *job; struct bsg_job *job;
int ret; int ret;
BUG_ON(req->special); BUG_ON(req->special);
job = kzalloc(sizeof(struct fc_bsg_job) + i->f->dd_bsg_size, job = kzalloc(sizeof(struct bsg_job) + i->f->dd_bsg_size,
GFP_KERNEL); GFP_KERNEL);
if (!job) if (!job)
return -ENOMEM; return -ENOMEM;
...@@ -3706,8 +3706,6 @@ fc_req_to_bsgjob(struct Scsi_Host *shost, struct fc_rport *rport, ...@@ -3706,8 +3706,6 @@ fc_req_to_bsgjob(struct Scsi_Host *shost, struct fc_rport *rport,
*/ */
req->special = job; req->special = job;
job->shost = shost;
job->rport = rport;
job->req = req; job->req = req;
if (i->f->dd_bsg_size) if (i->f->dd_bsg_size)
job->dd_data = (void *)&job[1]; job->dd_data = (void *)&job[1];
...@@ -3760,7 +3758,7 @@ enum fc_dispatch_result { ...@@ -3760,7 +3758,7 @@ enum fc_dispatch_result {
*/ */
static enum fc_dispatch_result static enum fc_dispatch_result
fc_bsg_host_dispatch(struct request_queue *q, struct Scsi_Host *shost, fc_bsg_host_dispatch(struct request_queue *q, struct Scsi_Host *shost,
struct fc_bsg_job *job) struct bsg_job *job)
{ {
struct fc_internal *i = to_fc_internal(shost->transportt); struct fc_internal *i = to_fc_internal(shost->transportt);
struct fc_bsg_request *bsg_request = job->request; struct fc_bsg_request *bsg_request = job->request;
...@@ -3862,7 +3860,7 @@ fc_bsg_goose_queue(struct fc_rport *rport) ...@@ -3862,7 +3860,7 @@ fc_bsg_goose_queue(struct fc_rport *rport)
*/ */
static enum fc_dispatch_result static enum fc_dispatch_result
fc_bsg_rport_dispatch(struct request_queue *q, struct Scsi_Host *shost, fc_bsg_rport_dispatch(struct request_queue *q, struct Scsi_Host *shost,
struct fc_rport *rport, struct fc_bsg_job *job) struct fc_rport *rport, struct bsg_job *job)
{ {
struct fc_internal *i = to_fc_internal(shost->transportt); struct fc_internal *i = to_fc_internal(shost->transportt);
struct fc_bsg_request *bsg_request = job->request; struct fc_bsg_request *bsg_request = job->request;
...@@ -3925,7 +3923,7 @@ fc_bsg_request_handler(struct request_queue *q, struct Scsi_Host *shost, ...@@ -3925,7 +3923,7 @@ fc_bsg_request_handler(struct request_queue *q, struct Scsi_Host *shost,
struct fc_rport *rport, struct device *dev) struct fc_rport *rport, struct device *dev)
{ {
struct request *req; struct request *req;
struct fc_bsg_job *job; struct bsg_job *job;
enum fc_dispatch_result ret; enum fc_dispatch_result ret;
struct fc_bsg_reply *bsg_reply; struct fc_bsg_reply *bsg_reply;
......
include/scsi/libfc.h
View file @ 75cc8cfc
...@@ -912,7 +912,7 @@ void fc_lport_recv(struct fc_lport *lport, struct fc_frame *fp); ...@@ -912,7 +912,7 @@ void fc_lport_recv(struct fc_lport *lport, struct fc_frame *fp);
int fc_set_mfs(struct fc_lport *, u32 mfs); int fc_set_mfs(struct fc_lport *, u32 mfs);
struct fc_lport *libfc_vport_create(struct fc_vport *, int privsize); struct fc_lport *libfc_vport_create(struct fc_vport *, int privsize);
struct fc_lport *fc_vport_id_lookup(struct fc_lport *, u32 port_id); struct fc_lport *fc_vport_id_lookup(struct fc_lport *, u32 port_id);
int fc_lport_bsg_request(struct fc_bsg_job *); int fc_lport_bsg_request(struct bsg_job *);
void fc_lport_set_local_id(struct fc_lport *, u32 port_id); void fc_lport_set_local_id(struct fc_lport *, u32 port_id);
void fc_lport_iterate(void (*func)(struct fc_lport *, void *), void *); void fc_lport_iterate(void (*func)(struct fc_lport *, void *), void *);
......
include/scsi/scsi_transport_fc.h
View file @ 75cc8cfc
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <scsi/scsi_netlink.h> #include <scsi/scsi_netlink.h>
#include <scsi/scsi_host.h>
struct scsi_transport_template; struct scsi_transport_template;
...@@ -625,38 +626,6 @@ struct fc_host_attrs { ...@@ -625,38 +626,6 @@ struct fc_host_attrs {
#define fc_host_dev_loss_tmo(x) \ #define fc_host_dev_loss_tmo(x) \
(((struct fc_host_attrs *)(x)->shost_data)->dev_loss_tmo) (((struct fc_host_attrs *)(x)->shost_data)->dev_loss_tmo)
/* Values for fc_bsg_job->state_flags (bitflags) */
#define FC_RQST_STATE_INPROGRESS 0
#define FC_RQST_STATE_DONE 1
struct fc_bsg_job {
struct Scsi_Host *shost;
struct fc_rport *rport;
struct device *dev;
struct request *req;
struct kref kref;
struct fc_bsg_request *request;
struct fc_bsg_reply *reply;
unsigned int request_len;
unsigned int reply_len;
/*
* On entry : reply_len indicates the buffer size allocated for
* the reply.
*
* Upon completion : the message handler must set reply_len
* to indicates the size of the reply to be returned to the
* caller.
*/
/* DMA payloads for the request/response */
struct bsg_buffer request_payload;
struct bsg_buffer reply_payload;
void *dd_data; /* Used for driver-specific storage */
};
/* The functions by which the transport class and the driver communicate */ /* The functions by which the transport class and the driver communicate */
struct fc_function_template { struct fc_function_template {
void (*get_rport_dev_loss_tmo)(struct fc_rport *); void (*get_rport_dev_loss_tmo)(struct fc_rport *);
...@@ -693,8 +662,8 @@ struct fc_function_template { ...@@ -693,8 +662,8 @@ struct fc_function_template {
int (* it_nexus_response)(struct Scsi_Host *, u64, int); int (* it_nexus_response)(struct Scsi_Host *, u64, int);
/* bsg support */ /* bsg support */
int (*bsg_request)(struct fc_bsg_job *); int (*bsg_request)(struct bsg_job *);
int (*bsg_timeout)(struct fc_bsg_job *); int (*bsg_timeout)(struct bsg_job *);
/* allocation lengths for host-specific data */ /* allocation lengths for host-specific data */
u32 dd_fcrport_size; u32 dd_fcrport_size;
...@@ -817,16 +786,6 @@ fc_vport_set_state(struct fc_vport *vport, enum fc_vport_state new_state) ...@@ -817,16 +786,6 @@ fc_vport_set_state(struct fc_vport *vport, enum fc_vport_state new_state)
vport->vport_state = new_state; vport->vport_state = new_state;
} }
static inline struct Scsi_Host *fc_bsg_to_shost(struct fc_bsg_job *job)
{
return job->shost;
}
static inline struct fc_rport *fc_bsg_to_rport(struct fc_bsg_job *job)
{
return job->rport;
}
struct scsi_transport_template *fc_attach_transport( struct scsi_transport_template *fc_attach_transport(
struct fc_function_template *); struct fc_function_template *);
void fc_release_transport(struct scsi_transport_template *); void fc_release_transport(struct scsi_transport_template *);
...@@ -849,7 +808,21 @@ struct fc_vport *fc_vport_create(struct Scsi_Host *shost, int channel, ...@@ -849,7 +808,21 @@ struct fc_vport *fc_vport_create(struct Scsi_Host *shost, int channel,
struct fc_vport_identifiers *); struct fc_vport_identifiers *);
int fc_vport_terminate(struct fc_vport *vport); int fc_vport_terminate(struct fc_vport *vport);
int fc_block_scsi_eh(struct scsi_cmnd *cmnd); int fc_block_scsi_eh(struct scsi_cmnd *cmnd);
void fc_bsg_jobdone(struct fc_bsg_job *job, int result, void fc_bsg_jobdone(struct bsg_job *job, int result,
unsigned int reply_payload_rcv_len); unsigned int reply_payload_rcv_len);
static inline struct Scsi_Host *fc_bsg_to_shost(struct bsg_job *job)
{
if (scsi_is_host_device(job->dev))
return dev_to_shost(job->dev);
return rport_to_shost(dev_to_rport(job->dev));
}
static inline struct fc_rport *fc_bsg_to_rport(struct bsg_job *job)
{
if (scsi_is_fc_rport(job->dev))
return dev_to_rport(job->dev);
return NULL;
}
#endif /* SCSI_TRANSPORT_FC_H */ #endif /* SCSI_TRANSPORT_FC_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7