From 770eba6e295fd36e43881176ee0644b9cc2803f1 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Thu, 25 Oct 2012 23:34:40 -0500 Subject: [PATCH] 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 Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 @@ /* Features supported by this (client software) implementation. */ -#define RBD_FEATURES_SUPPORTED (0) +#define RBD_FEATURES_SUPPORTED (RBD_FEATURES_ALL) /* * 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) 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!"); } /* If the image supports fancy striping, get its parameters */ -- 2.20.1