Skip to content

Commit

Permalink
rbd: allow null image name
Browse files Browse the repository at this point in the history
We will know the image id for format 2 parent images, but won't
initially know its image name.  Avoid making the query for an image
id in rbd_dev_image_id() if it's already known.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
  • Loading branch information
Alex Elder committed Nov 1, 2012
1 parent 83a0626 commit 2c0d0a1
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/block/rbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -3067,6 +3067,14 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)
void *response;
void *p;

/*
* When probing a parent image, the image id is already
* known (and the image name likely is not). There's no
* need to fetch the image id again in this case.
*/
if (rbd_dev->spec->image_id)
return 0;

/*
* First, see if the format 2 image id file exists, and if
* so, get the image's persistent id from it.
Expand Down

0 comments on commit 2c0d0a1

Please sign in to comment.