aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-10-26 00:34:40 -0400
committerSage Weil <sage@inktank.com>2013-05-02 00:19:23 -0400
commit770eba6e295fd36e43881176ee0644b9cc2803f1 (patch)
tree2aae2f2850f845082ccfb5f07847db8b651525ba
parentcc070d59bc422945f83a89e9d60f749d0f82787d (diff)
rbd: activate support for layered images
Now that we have most everything in place to support layered rbd images, enable support for them in the kernel client. Issue a warning to the log that the support is considered experimental whenever a format 2 layered image is mapped. Note that we also have to claim to support the STRIPINGV2 feature, due to a mistake in the way the rbd CLI set up those flags. This feature can work if it has the right parameters, and safeguards have been put in place to reject those images that do not have compatible parameters. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
-rw-r--r--drivers/block/rbd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index c6a3f46bc8d5..4d99d40034e1 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -80,7 +80,7 @@
80 80
81/* Features supported by this (client software) implementation. */ 81/* Features supported by this (client software) implementation. */
82 82
83#define RBD_FEATURES_SUPPORTED (0) 83#define RBD_FEATURES_SUPPORTED (RBD_FEATURES_ALL)
84 84
85/* 85/*
86 * An RBD device name will be "rbd#", where the "rbd" comes from 86 * An RBD device name will be "rbd#", where the "rbd" comes from
@@ -4724,6 +4724,8 @@ static int rbd_dev_v2_probe(struct rbd_device *rbd_dev)
4724 ret = rbd_dev_v2_parent_info(rbd_dev); 4724 ret = rbd_dev_v2_parent_info(rbd_dev);
4725 if (ret) 4725 if (ret)
4726 goto out_err; 4726 goto out_err;
4727 rbd_warn(rbd_dev, "WARNING: kernel support for "
4728 "layered rbd images is EXPERIMENTAL!");
4727 } 4729 }
4728 4730
4729 /* If the image supports fancy striping, get its parameters */ 4731 /* If the image supports fancy striping, get its parameters */