Commit c1225f01 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: bsg-lib: pass the release callback through bsg_setup_queue 



The SAS code will need it.  Also mark the name argument const to match
bsg_register_queue.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ccf1e004

block/bsg-lib.c

+4 −3
Original line number Diff line number Diff line
@@ -226,8 +226,9 @@ static void bsg_request_fn(struct request_queue *q) 
 * @job_fn: bsg job handler

 * @dd_job_size: size of LLD data needed for each job

 */

struct request_queue *bsg_setup_queue(struct device *dev, char *name,

		bsg_job_fn *job_fn, int dd_job_size)

struct request_queue *bsg_setup_queue(struct device *dev, const char *name,

		bsg_job_fn *job_fn, int dd_job_size,

		void (*release)(struct device *))

{

	struct request_queue *q;

	int ret;
@@ -250,7 +251,7 @@ struct request_queue *bsg_setup_queue(struct device *dev, char *name, 
	blk_queue_softirq_done(q, bsg_softirq_done);

	blk_queue_rq_timeout(q, BLK_DEFAULT_SG_TIMEOUT);



	ret = bsg_register_queue(q, dev, name, NULL);

	ret = bsg_register_queue(q, dev, name, release);

	if (ret) {

		printk(KERN_ERR "%s: bsg interface failed to "

		       "initialize - register queue\n", dev->kobj.name);

drivers/scsi/scsi_transport_fc.c

+4 −2
Original line number Diff line number Diff line
@@ -3784,7 +3784,8 @@ fc_bsg_hostadd(struct Scsi_Host *shost, struct fc_host_attrs *fc_host) 
	snprintf(bsg_name, sizeof(bsg_name),

		 "fc_host%d", shost->host_no);



	q = bsg_setup_queue(dev, bsg_name, fc_bsg_dispatch, i->f->dd_bsg_size);

	q = bsg_setup_queue(dev, bsg_name, fc_bsg_dispatch, i->f->dd_bsg_size,

			NULL);

	if (IS_ERR(q)) {

		dev_err(dev,

			"fc_host%d: bsg interface failed to initialize - setup queue\n",
@@ -3829,7 +3830,8 @@ fc_bsg_rportadd(struct Scsi_Host *shost, struct fc_rport *rport) 
	if (!i->f->bsg_request)

		return -ENOTSUPP;



	q = bsg_setup_queue(dev, NULL, fc_bsg_dispatch, i->f->dd_bsg_size);

	q = bsg_setup_queue(dev, NULL, fc_bsg_dispatch, i->f->dd_bsg_size,

			NULL);

	if (IS_ERR(q)) {

		dev_err(dev, "failed to setup bsg queue\n");

		return PTR_ERR(q);

drivers/scsi/scsi_transport_iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1542,7 +1542,7 @@ iscsi_bsg_host_add(struct Scsi_Host *shost, struct iscsi_cls_host *ihost) 
		return -ENOTSUPP;



	snprintf(bsg_name, sizeof(bsg_name), "iscsi_host%d", shost->host_no);

	q = bsg_setup_queue(dev, bsg_name, iscsi_bsg_host_dispatch, 0);

	q = bsg_setup_queue(dev, bsg_name, iscsi_bsg_host_dispatch, 0, NULL);

	if (IS_ERR(q)) {

		shost_printk(KERN_ERR, shost, "bsg interface failed to "

			     "initialize - no request queue\n");

include/linux/bsg-lib.h

+3 −2
Original line number Diff line number Diff line
@@ -66,8 +66,9 @@ struct bsg_job { 


void bsg_job_done(struct bsg_job *job, int result,

		  unsigned int reply_payload_rcv_len);

struct request_queue *bsg_setup_queue(struct device *dev, char *name,

		bsg_job_fn *job_fn, int dd_job_size);

struct request_queue *bsg_setup_queue(struct device *dev, const char *name,

		bsg_job_fn *job_fn, int dd_job_size,

		void (*release)(struct device *));

void bsg_job_put(struct bsg_job *job);

int __must_check bsg_job_get(struct bsg_job *job);