Re: [PATCH 6/7] rbd: rename rbd_dev_probe()

[Josh Durgin <josh.durgin@inktank.com>]

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

On 04/26/2013 11:01 AM, Alex Elder wrote:
> Rename rbd_dev_probe() to be rbd_dev_probe_image().  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>
> ---
>   drivers/block/rbd.c |    8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index 0356bba..f65310c6 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -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_probe_image(struct rbd_device *rbd_dev);
>
>   static struct bus_attribute rbd_bus_attrs[] = {
>   	__ATTR(add, S_IWUSR, NULL, rbd_add),
> @@ -4762,7 +4762,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_probe_image(parent);
>   		if (ret < 0)
>   			goto err_out_parent;
>   		rbd_dev->parent = parent;
> @@ -4811,7 +4811,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_probe_image(struct rbd_device *rbd_dev)
>   {
>   	int ret;
>
> @@ -4899,7 +4899,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_probe_image(rbd_dev);
>   	if (rc < 0)
>   		goto err_out_rbd_dev;
>