diff options
| author | Alex Elder <elder@inktank.com> | 2012-08-29 17:11:06 -0500 |
|---|---|---|
| committer | Alex Elder <elder@inktank.com> | 2012-10-01 14:30:51 -0500 |
| commit | 1fcdb8aa1f58af72eb8206ba97fab2df77df2b14 (patch) | |
| tree | a9490606d69803a08a1739044c569257e9e10fa2 /drivers/block | |
| parent | 2ac4e75d89e9df8eea6390a759eac2b6df0ebff6 (diff) | |
| download | blackbird-obmc-linux-1fcdb8aa1f58af72eb8206ba97fab2df77df2b14.tar.gz blackbird-obmc-linux-1fcdb8aa1f58af72eb8206ba97fab2df77df2b14.zip | |
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: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/rbd.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 6e735a754b5f..634a16c40291 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1870,14 +1870,12 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) { struct gendisk *disk; struct request_queue *q; - int rc; u64 segment_size; /* create gendisk info */ - rc = -ENOMEM; disk = alloc_disk(RBD_MINORS_PER_MAJOR); if (!disk) - goto out; + return -ENOMEM; snprintf(disk->disk_name, sizeof(disk->disk_name), RBD_DRV_NAME "%d", rbd_dev->dev_id); @@ -1887,7 +1885,6 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) disk->private_data = rbd_dev; /* init rq */ - rc = -ENOMEM; q = blk_init_queue(rbd_rq_fn, &rbd_dev->lock); if (!q) goto out_disk; @@ -1910,11 +1907,10 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) rbd_dev->disk = disk; return 0; - out_disk: put_disk(disk); -out: - return rc; + + return -ENOMEM; } /* |
