diff options
| author | Alex Elder <elder@inktank.com> | 2012-10-30 19:40:33 -0500 |
|---|---|---|
| committer | Alex Elder <elder@inktank.com> | 2012-11-01 07:55:42 -0500 |
| commit | a92ffdf8a9b09f8fae9a8f418f87f30a5e459570 (patch) | |
| tree | 61afe269696ac3ce6f999f67f6cc9385a0bd637c /drivers/block | |
| parent | 2c0d0a10ea89456781218f458f6bf72e99d87d2a (diff) | |
| download | linux-stable-a92ffdf8a9b09f8fae9a8f418f87f30a5e459570.tar.gz linux-stable-a92ffdf8a9b09f8fae9a8f418f87f30a5e459570.tar.bz2 linux-stable-a92ffdf8a9b09f8fae9a8f418f87f30a5e459570.zip | |
rbd: allow null image name
Format 2 parent images are partially identified by their image id,
but it may not be possible to determine their image name. The name
is not strictly needed for correct operation, so we won't be
treating it as an error if we don't know it. Handle this case
gracefully in rbd_name_show().
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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index a8521338bf46..28052ff679ca 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1982,7 +1982,10 @@ static ssize_t rbd_name_show(struct device *dev, { struct rbd_device *rbd_dev = dev_to_rbd_dev(dev); - return sprintf(buf, "%s\n", rbd_dev->spec->image_name); + if (rbd_dev->spec->image_name) + return sprintf(buf, "%s\n", rbd_dev->spec->image_name); + + return sprintf(buf, "(unknown)\n"); } static ssize_t rbd_image_id_show(struct device *dev, |