Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31156ec3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

bsg-lib: introduce a timeout field in struct bsg_job 



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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBenjamin Block <bblock@linux.vnet.ibm.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ce3077ee

block/bsg-lib.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

drivers/s390/scsi/zfcp_fc.c

+2 −2
Original line number Diff line number Diff line
@@ -961,7 +961,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,
@@ -980,7 +980,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);

include/linux/bsg-lib.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ struct bsg_job { 


	struct kref kref;



	unsigned int timeout;



	/* Transport/driver specific request/reply structs */

	void *request;

	void *reply;