Commit eb340948 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Martin K. Petersen

scsi: Get rid of struct fc_bsg_buffer

struct fc_bsg_buffer is just a clone of struct bsg_buffer from bsg-lib,
so use this one instead.
Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent af15769f
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/bsg-lib.h>
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
...@@ -211,7 +212,7 @@ lpfc_alloc_bsg_buffers(struct lpfc_hba *phba, unsigned int size, ...@@ -211,7 +212,7 @@ lpfc_alloc_bsg_buffers(struct lpfc_hba *phba, unsigned int size,
static unsigned int static unsigned int
lpfc_bsg_copy_data(struct lpfc_dmabuf *dma_buffers, lpfc_bsg_copy_data(struct lpfc_dmabuf *dma_buffers,
struct fc_bsg_buffer *bsg_buffers, struct bsg_buffer *bsg_buffers,
unsigned int bytes_to_transfer, int to_buffers) unsigned int bytes_to_transfer, int to_buffers)
{ {
......
...@@ -3671,7 +3671,7 @@ fc_bsg_job_timeout(struct request *req) ...@@ -3671,7 +3671,7 @@ fc_bsg_job_timeout(struct request *req)
} }
static int static int
fc_bsg_map_buffer(struct fc_bsg_buffer *buf, struct request *req) fc_bsg_map_buffer(struct bsg_buffer *buf, struct request *req)
{ {
size_t sz = (sizeof(struct scatterlist) * req->nr_phys_segments); size_t sz = (sizeof(struct scatterlist) * req->nr_phys_segments);
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#define SCSI_TRANSPORT_FC_H #define SCSI_TRANSPORT_FC_H
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/bsg-lib.h>
#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>
...@@ -624,13 +625,6 @@ struct fc_host_attrs { ...@@ -624,13 +625,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)
struct fc_bsg_buffer {
unsigned int payload_len;
int sg_cnt;
struct scatterlist *sg_list;
};
/* Values for fc_bsg_job->state_flags (bitflags) */ /* Values for fc_bsg_job->state_flags (bitflags) */
#define FC_RQST_STATE_INPROGRESS 0 #define FC_RQST_STATE_INPROGRESS 0
#define FC_RQST_STATE_DONE 1 #define FC_RQST_STATE_DONE 1
...@@ -659,8 +653,8 @@ struct fc_bsg_job { ...@@ -659,8 +653,8 @@ struct fc_bsg_job {
*/ */
/* DMA payloads for the request/response */ /* DMA payloads for the request/response */
struct fc_bsg_buffer request_payload; struct bsg_buffer request_payload;
struct fc_bsg_buffer reply_payload; struct bsg_buffer reply_payload;
void *dd_data; /* Used for driver-specific storage */ void *dd_data; /* Used for driver-specific storage */
}; };
......
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