iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rbd: rename rbd_dev_probe()

Browse Source 
Rename rbd_dev_probe() to be rbd_dev_image_probe().  Its purpose
will eventually be to probe for the existence of a valid rbd image
for the rbd device--focusing only on the ceph side and not the Linux
device side of initialization.

For now the two "sides" are not fully separated, and this function
is still the entry point for initializing the full 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 09:43:48 -05:00 committed by Sage Weil
parent 9f5dffdc8f
commit 71f293e26e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/block/rbd.c
View File

@ -365,7 +365,7 @@ static ssize_t rbd_add(struct bus_type *bus, const char *buf,
size_t count);
static ssize_t rbd_remove(struct bus_type *bus, const char *buf,
size_t count);
static int rbd_dev_probe(struct rbd_device *rbd_dev);
static int rbd_dev_image_probe(struct rbd_device *rbd_dev);
static struct bus_attribute rbd_bus_attrs[] = {
__ATTR(add, S_IWUSR, NULL, rbd_add),
@ -4766,7 +4766,7 @@ static int rbd_dev_probe_finish(struct rbd_device *rbd_dev)
}
rbdc = NULL; /* parent now owns reference */
parent_spec = NULL; /* parent now owns reference */
ret = rbd_dev_probe(parent);
ret = rbd_dev_image_probe(parent);
if (ret < 0)
goto err_out_parent;
rbd_dev->parent = parent;
@ -4815,7 +4815,7 @@ err_out_snaps:
* device. For format 2 images this includes determining the image
* id.
*/
static int rbd_dev_probe(struct rbd_device *rbd_dev)
static int rbd_dev_image_probe(struct rbd_device *rbd_dev)
{
int ret;
@ -4904,7 +4904,7 @@ static ssize_t rbd_add(struct bus_type *bus,
kfree(rbd_opts);
rbd_opts = NULL; /* done with this */
rc = rbd_dev_probe(rbd_dev);
rc = rbd_dev_image_probe(rbd_dev);
if (rc < 0)
goto err_out_rbd_dev;