korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 21:24:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

bsg-lib: remove bsg_job.req

Browse Source 
Users of the bsg-lib interface should only use the bsg_job data structure
and not know about implementation details of it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Benjamin Block <bblock@linux.vnet.ibm.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2018-03-13 17:28:40 +01:00 committed by Jens Axboe
parent 31156ec378
commit ef6fa64f9b
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
block/bsg-lib.c
View File

@ -35,7 +35,7 @@
static void bsg_teardown_job(struct kref *kref) static void bsg_teardown_job(struct kref *kref)
{ {
struct bsg_job *job = container_of(kref, struct bsg_job, kref); struct bsg_job *job = container_of(kref, struct bsg_job, kref);
struct request *rq = job->req; struct request *rq = blk_mq_rq_from_pdu(job);
put_device(job->dev); /* release reference for the request */ put_device(job->dev); /* release reference for the request */
@ -68,19 +68,18 @@ EXPORT_SYMBOL_GPL(bsg_job_get);
void bsg_job_done(struct bsg_job *job, int result, void bsg_job_done(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 = blk_mq_rq_from_pdu(job);
struct request *rsp = req->next_rq; struct request *rsp = req->next_rq;
struct scsi_request *rq = scsi_req(req);
int err; int err;
err = scsi_req(job->req)->result = result; err = job->sreq.result = result;
if (err < 0) if (err < 0)
/* we're only returning the result field in the reply */ /* we're only returning the result field in the reply */
rq->sense_len = sizeof(u32); job->sreq.sense_len = sizeof(u32);
else else
rq->sense_len = job->reply_len; job->sreq.sense_len = job->reply_len;
/* we assume all request payload was transferred, residual == 0 */ /* we assume all request payload was transferred, residual == 0 */
rq->resid_len = 0; job->sreq.resid_len = 0;
if (rsp) { if (rsp) {
WARN_ON(reply_payload_rcv_len > scsi_req(rsp)->resid_len); WARN_ON(reply_payload_rcv_len > scsi_req(rsp)->resid_len);
@ -232,7 +231,6 @@ static void bsg_initialize_rq(struct request *req)
sreq->sense = sense; sreq->sense = sense;
sreq->sense_len = SCSI_SENSE_BUFFERSIZE; sreq->sense_len = SCSI_SENSE_BUFFERSIZE;
job->req = req;
job->reply = sense; job->reply = sense;
job->reply_len = sreq->sense_len; job->reply_len = sreq->sense_len;
job->dd_data = job + 1; job->dd_data = job + 1;

1
include/linux/bsg-lib.h
View File

@ -40,7 +40,6 @@ struct bsg_buffer {
struct bsg_job { struct bsg_job {
struct scsi_request sreq; struct scsi_request sreq;
struct device *dev; struct device *dev;
struct request *req;
struct kref kref; struct kref kref;