hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rbd: probe for the parent earlier 

Probe for a parent device earlier in rbd_dev_probe_finish(), before
starting to set up the Linux side of the rbd device.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder 2013-04-26 15:44:37 -05:00 committed by Sage Weil
parent 2e93bf9e46
commit 5de10f3b0c
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/block/rbd.c
View File

@ -4772,6 +4772,10 @@ static int rbd_dev_probe_finish(struct rbd_device *rbd_dev)
if (ret) if (ret)
goto err_out_snaps; goto err_out_snaps;
ret = rbd_dev_probe_parent(rbd_dev);
if (ret)
goto err_out_mapping;
/* generate unique id: find highest unique id, add one */ /* generate unique id: find highest unique id, add one */
rbd_dev_id_get(rbd_dev); rbd_dev_id_get(rbd_dev);
@ -4797,10 +4801,6 @@ static int rbd_dev_probe_finish(struct rbd_device *rbd_dev)
if (ret) if (ret)
goto err_out_disk; goto err_out_disk;
ret = rbd_dev_probe_parent(rbd_dev);
if (ret)
goto err_out_bus;
/* Everything's ready. Announce the disk to the world. */ /* Everything's ready. Announce the disk to the world. */
set_capacity(rbd_dev->disk, rbd_dev->mapping.size / SECTOR_SIZE); set_capacity(rbd_dev->disk, rbd_dev->mapping.size / SECTOR_SIZE);
@ -4812,17 +4812,14 @@ static int rbd_dev_probe_finish(struct rbd_device *rbd_dev)
return ret; return ret;
err_out_bus:
rbd_dev_remove_parent(rbd_dev);
rbd_bus_del_dev(rbd_dev);
return ret;
err_out_disk: err_out_disk:
rbd_free_disk(rbd_dev); rbd_free_disk(rbd_dev);
err_out_blkdev: err_out_blkdev:
unregister_blkdev(rbd_dev->major, rbd_dev->name); unregister_blkdev(rbd_dev->major, rbd_dev->name);
err_out_id: err_out_id:
rbd_dev_id_put(rbd_dev); rbd_dev_id_put(rbd_dev);
rbd_dev_remove_parent(rbd_dev);
err_out_mapping:
rbd_dev_mapping_clear(rbd_dev); rbd_dev_mapping_clear(rbd_dev);
err_out_snaps: err_out_snaps:
rbd_remove_all_snaps(rbd_dev); rbd_remove_all_snaps(rbd_dev);