diff options
| author | Alex Elder <elder@inktank.com> | 2013-04-30 00:44:32 -0500 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-05-01 21:20:10 -0700 |
| commit | 96882f55c40dcb4cd80b81a4374fdd297109ec98 (patch) | |
| tree | 68a83f8542a659aa6e5f398f0448d538ce999deb /drivers | |
| parent | 812164f8c3f6f5348aa69003a2f81775c2872ac0 (diff) | |
rbd: fix up the layering warning message
A warning gets spewed for any image being probed, including parent
images. Set up a condition such that the warning message only gets
printed for the image being mapped, not any of its parents.
Also, I didn't like the way the warning ended up being so long.
Make it a terse warning instead. People experimenting with layering
will know what the message means.
This is part of:
http://tracker.ceph.com/issues/4867
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/rbd.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 5c1c38dc0b51..71e2de2cff22 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -4624,8 +4624,15 @@ static int rbd_dev_v2_probe(struct rbd_device *rbd_dev) ret = rbd_dev_v2_parent_info(rbd_dev); if (ret) goto out_err; - rbd_warn(rbd_dev, "WARNING: kernel support for " - "layered rbd images is EXPERIMENTAL!"); + + /* + * Don't print a warning for parent images. We can + * tell this point because we won't know its pool + * name yet (just its pool id). + */ + if (rbd_dev->spec->pool_name) + rbd_warn(rbd_dev, "WARNING: kernel layering " + "is EXPERIMENTAL!"); } /* If the image supports fancy striping, get its parameters */ |