summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-07-10 20:30:10 -0500
committerAlex Elder <elder@inktank.com>2012-10-01 14:30:53 -0500
commit3bb59ad515527fa75cf71d997d17cea18160da74 (patch)
treef93f9b6f42df400e2b989e1c9d24c3f0f77b83a9 /drivers/block
parentf8d4de6e1c939d56f1ee0a21ad677401846f990c (diff)
downloadlinux-3.10-3bb59ad515527fa75cf71d997d17cea18160da74.tar.gz
linux-3.10-3bb59ad515527fa75cf71d997d17cea18160da74.tar.bz2
linux-3.10-3bb59ad515527fa75cf71d997d17cea18160da74.zip
rbd: define some new format constants
Define constant symbols related to the rbd format 2 object names. This begins to bring this version of the "rbd_types.h" header more in line with the current user-space version of that file. Complete reconciliation of differences will be done at some point later, as a separate task. 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_types.h25
1 files changed, 20 insertions, 5 deletions
diff --git a/drivers/block/rbd_types.h b/drivers/block/rbd_types.h
index d9d8a77748b..cbe77fa105b 100644
--- a/drivers/block/rbd_types.h
+++ b/drivers/block/rbd_types.h
@@ -15,15 +15,30 @@
#include <linux/types.h>
+/* For format version 2, rbd image 'foo' consists of objects
+ * rbd_id.foo - id of image
+ * rbd_header.<id> - image metadata
+ * rbd_data.<id>.0000000000000000
+ * rbd_data.<id>.0000000000000001
+ * ... - data
+ * Clients do not access header data directly in rbd format 2.
+ */
+
+#define RBD_HEADER_PREFIX "rbd_header."
+#define RBD_DATA_PREFIX "rbd_data."
+#define RBD_ID_PREFIX "rbd_id."
+
/*
- * rbd image 'foo' consists of objects
- * foo.rbd - image metadata
- * foo.00000000
- * foo.00000001
- * ... - data
+ * For format version 1, rbd image 'foo' consists of objects
+ * foo.rbd - image metadata
+ * rb.<idhi>.<idlo>.00000000
+ * rb.<idhi>.<idlo>.00000001
+ * ... - data
+ * There is no notion of a persistent image id in rbd format 1.
*/
#define RBD_SUFFIX ".rbd"
+
#define RBD_DIRECTORY "rbd_directory"
#define RBD_INFO "rbd_info"