| Message ID | 20171003104845.10417-7-hch@lst.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 10/03/2017 12:48 PM, Christoph Hellwig wrote: > The zfcp driver wants to know the timeout for a bsg job, so add a field > to struct bsg_job for it in preparation of not exposing the request > to the bsg-lib users. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > block/bsg-lib.c | 1 + > drivers/s390/scsi/zfcp_fc.c | 4 ++-- > include/linux/bsg-lib.h | 2 ++ > 3 files changed, 5 insertions(+), 2 deletions(-) > Reviewed-by: Hannes Reinecke <hare@suse.com> Cheers, Hannes
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
On Tue, Oct 03, 2017 at 12:48:42PM +0200, Christoph Hellwig wrote: > The zfcp driver wants to know the timeout for a bsg job, so add a field > to struct bsg_job for it in preparation of not exposing the request > to the bsg-lib users. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > block/bsg-lib.c | 1 + > drivers/s390/scsi/zfcp_fc.c | 4 ++-- > include/linux/bsg-lib.h | 2 ++ > 3 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/block/bsg-lib.c b/block/bsg-lib.c > index 15d25ccd51a5..0d5bbf6a2ddd 100644 > --- a/block/bsg-lib.c > +++ b/block/bsg-lib.c > @@ -132,6 +132,7 @@ static int bsg_prepare_job(struct device *dev, struct request *req) > struct bsg_job *job = blk_mq_rq_to_pdu(req); > int ret; > > + job->timeout = req->timeout; > job->request = rq->cmd; > job->request_len = rq->cmd_len; > > diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c > index 8210645c2111..9d6f69b92c81 100644 > --- a/drivers/s390/scsi/zfcp_fc.c > +++ b/drivers/s390/scsi/zfcp_fc.c > @@ -960,7 +960,7 @@ static int zfcp_fc_exec_els_job(struct bsg_job *job, > d_id = ntoh24(bsg_request->rqst_data.h_els.port_id); > > els->handler = zfcp_fc_ct_els_job_handler; > - return zfcp_fsf_send_els(adapter, d_id, els, job->req->timeout / HZ); > + return zfcp_fsf_send_els(adapter, d_id, els, job->timeout / HZ); > } > > static int zfcp_fc_exec_ct_job(struct bsg_job *job, > @@ -979,7 +979,7 @@ static int zfcp_fc_exec_ct_job(struct bsg_job *job, > return ret; > > ct->handler = zfcp_fc_ct_job_handler; > - ret = zfcp_fsf_send_ct(wka_port, ct, NULL, job->req->timeout / HZ); > + ret = zfcp_fsf_send_ct(wka_port, ct, NULL, job->timeout / HZ); > if (ret) > zfcp_fc_wka_port_put(wka_port); > > diff --git a/include/linux/bsg-lib.h b/include/linux/bsg-lib.h > index b1be0233ce35..402223c95ce1 100644 > --- a/include/linux/bsg-lib.h > +++ b/include/linux/bsg-lib.h > @@ -44,6 +44,8 @@ struct bsg_job { > > struct kref kref; > > + unsigned int timeout; > + > /* Transport/driver specific request/reply structs */ > void *request; > void *reply; > -- > 2.14.1 > Reviewed-by: Benjamin Block <bblock@linux.vnet.ibm.com> Beste Grüße / Best regards, - Benjamin Block
diff --git a/block/bsg-lib.c b/block/bsg-lib.c index 15d25ccd51a5..0d5bbf6a2ddd 100644 --- a/block/bsg-lib.c +++ b/block/bsg-lib.c @@ -132,6 +132,7 @@ static int bsg_prepare_job(struct device *dev, struct request *req) struct bsg_job *job = blk_mq_rq_to_pdu(req); int ret; + job->timeout = req->timeout; job->request = rq->cmd; job->request_len = rq->cmd_len; diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c index 8210645c2111..9d6f69b92c81 100644 --- a/drivers/s390/scsi/zfcp_fc.c +++ b/drivers/s390/scsi/zfcp_fc.c @@ -960,7 +960,7 @@ static int zfcp_fc_exec_els_job(struct bsg_job *job, d_id = ntoh24(bsg_request->rqst_data.h_els.port_id); els->handler = zfcp_fc_ct_els_job_handler; - return zfcp_fsf_send_els(adapter, d_id, els, job->req->timeout / HZ); + return zfcp_fsf_send_els(adapter, d_id, els, job->timeout / HZ); } static int zfcp_fc_exec_ct_job(struct bsg_job *job, @@ -979,7 +979,7 @@ static int zfcp_fc_exec_ct_job(struct bsg_job *job, return ret; ct->handler = zfcp_fc_ct_job_handler; - ret = zfcp_fsf_send_ct(wka_port, ct, NULL, job->req->timeout / HZ); + ret = zfcp_fsf_send_ct(wka_port, ct, NULL, job->timeout / HZ); if (ret) zfcp_fc_wka_port_put(wka_port); diff --git a/include/linux/bsg-lib.h b/include/linux/bsg-lib.h index b1be0233ce35..402223c95ce1 100644 --- a/include/linux/bsg-lib.h +++ b/include/linux/bsg-lib.h @@ -44,6 +44,8 @@ struct bsg_job { struct kref kref; + unsigned int timeout; + /* Transport/driver specific request/reply structs */ void *request; void *reply;
The zfcp driver wants to know the timeout for a bsg job, so add a field to struct bsg_job for it in preparation of not exposing the request to the bsg-lib users. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/bsg-lib.c | 1 + drivers/s390/scsi/zfcp_fc.c | 4 ++-- include/linux/bsg-lib.h | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-)