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

Commit 1fcdb8aa authored by Alex Elder's avatar Alex Elder
Browse files

rbd: simplify rbd_init_disk() a bit 



This just simplifies a few things in rbd_init_disk(), now that the
previous patch has moved a bunch of initialization code out if it.
Done separately to facilitate review.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 2ac4e75d

drivers/block/rbd.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -1870,14 +1870,12 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) 
{

{

	struct gendisk *disk;

	struct gendisk *disk;

	struct request_queue *q;

	struct request_queue *q;

	int rc;

	u64 segment_size;

	u64 segment_size;





	/* create gendisk info */

	/* create gendisk info */

	rc = -ENOMEM;

	disk = alloc_disk(RBD_MINORS_PER_MAJOR);

	disk = alloc_disk(RBD_MINORS_PER_MAJOR);

	if (!disk)

	if (!disk)

		goto out;

		return -ENOMEM;





	snprintf(disk->disk_name, sizeof(disk->disk_name), RBD_DRV_NAME "%d",

	snprintf(disk->disk_name, sizeof(disk->disk_name), RBD_DRV_NAME "%d",

		 rbd_dev->dev_id);

		 rbd_dev->dev_id);
@@ -1887,7 +1885,6 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) 
	disk->private_data = rbd_dev;

	disk->private_data = rbd_dev;





	/* init rq */

	/* init rq */

	rc = -ENOMEM;

	q = blk_init_queue(rbd_rq_fn, &rbd_dev->lock);

	q = blk_init_queue(rbd_rq_fn, &rbd_dev->lock);

	if (!q)

	if (!q)

		goto out_disk;

		goto out_disk;
@@ -1910,11 +1907,10 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) 
	rbd_dev->disk = disk;

	rbd_dev->disk = disk;





	return 0;

	return 0;



out_disk:

out_disk:

	put_disk(disk);

	put_disk(disk);

out:



	return rc;

	return -ENOMEM;

}

}





/*

/*