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

Commit c3ff1b90 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by James Bottomley
Browse files

[SCSI] bsg: replace kobject_get with blk_get_queue 



Both takes a ref to a queue. But blk_get_queue checks QUEUE_FLAG_DEAD
and is more appropriate interface here.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent d45ac4fa

block/bsg.c

+7 −2
Original line number Diff line number Diff line
@@ -740,16 +740,21 @@ static struct bsg_device *bsg_add_device(struct inode *inode, 
					 struct file *file)

{

	struct bsg_device *bd;

	int ret;

#ifdef BSG_DEBUG

	unsigned char buf[32];

#endif

	ret = blk_get_queue(rq);

	if (ret)

		return ERR_PTR(-ENXIO);



	bd = bsg_alloc_device();

	if (!bd)

	if (!bd) {

		blk_put_queue(rq);

		return ERR_PTR(-ENOMEM);

	}



	bd->queue = rq;

	kobject_get(&rq->kobj);

	bsg_set_block(bd, file);



	atomic_set(&bd->ref_count, 1);