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

Commit 09ac46c4 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

block: misc updates to blk_get_queue() 



* blk_get_queue() is peculiar in that it returns 0 on success and 1 on
  failure instead of 0 / -errno or boolean.  Update it such that it
  returns %true on success and %false on failure.

* Make sure the caller checks for the return value.

* Separate out __blk_get_queue() which doesn't check whether @q is
  dead and put it in blk.h.  This will be used later.

This patch doesn't introduce any functional changes.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6e736be7

block/blk-core.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -626,14 +626,14 @@ blk_init_allocated_queue_node(struct request_queue *q, request_fn_proc *rfn, 
}

}

EXPORT_SYMBOL(blk_init_allocated_queue_node);

EXPORT_SYMBOL(blk_init_allocated_queue_node);





int blk_get_queue(struct request_queue *q)

bool blk_get_queue(struct request_queue *q)

{

{

	if (likely(!blk_queue_dead(q))) {

	if (likely(!blk_queue_dead(q))) {

		kobject_get(&q->kobj);

		__blk_get_queue(q);

		return 0;

		return true;

	}

	}





	return 1;

	return false;

}

}

EXPORT_SYMBOL(blk_get_queue);

EXPORT_SYMBOL(blk_get_queue);

block/blk.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,11 @@ extern struct kmem_cache *blk_requestq_cachep; 
extern struct kobj_type blk_queue_ktype;

extern struct kobj_type blk_queue_ktype;

extern struct ida blk_queue_ida;

extern struct ida blk_queue_ida;





static inline void __blk_get_queue(struct request_queue *q)

{

	kobject_get(&q->kobj);

}



void init_request_from_bio(struct request *req, struct bio *bio);

void init_request_from_bio(struct request *req, struct bio *bio);

void blk_rq_bio_prep(struct request_queue *q, struct request *rq,

void blk_rq_bio_prep(struct request_queue *q, struct request *rq,

			struct bio *bio);

			struct bio *bio);

block/bsg.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -769,12 +769,10 @@ static struct bsg_device *bsg_add_device(struct inode *inode, 
					 struct file *file)

					 struct file *file)

{

{

	struct bsg_device *bd;

	struct bsg_device *bd;

	int ret;

#ifdef BSG_DEBUG

#ifdef BSG_DEBUG

	unsigned char buf[32];

	unsigned char buf[32];

#endif

#endif

	ret = blk_get_queue(rq);

	if (!blk_get_queue(rq))

	if (ret)

		return ERR_PTR(-ENXIO);

		return ERR_PTR(-ENXIO);





	bd = bsg_alloc_device();

	bd = bsg_alloc_device();

block/genhd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -615,7 +615,7 @@ void add_disk(struct gendisk *disk) 
	 * Take an extra ref on queue which will be put on disk_release()

	 * Take an extra ref on queue which will be put on disk_release()

	 * so that it sticks around as long as @disk is there.

	 * so that it sticks around as long as @disk is there.

	 */

	 */

	WARN_ON_ONCE(blk_get_queue(disk->queue));

	WARN_ON_ONCE(!blk_get_queue(disk->queue));





	retval = sysfs_create_link(&disk_to_dev(disk)->kobj, &bdi->dev->kobj,

	retval = sysfs_create_link(&disk_to_dev(disk)->kobj, &bdi->dev->kobj,

				   "bdi");

				   "bdi");

drivers/scsi/scsi_scan.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -297,7 +297,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget, 
		kfree(sdev);

		kfree(sdev);

		goto out;

		goto out;

	}

	}

	blk_get_queue(sdev->request_queue);

	WARN_ON_ONCE(!blk_get_queue(sdev->request_queue));

	sdev->request_queue->queuedata = sdev;

	sdev->request_queue->queuedata = sdev;

	scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);

	scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);