From 29a94e03b5cf5898ab85c3c3d21180bdfd36bf26 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 19 Jul 2021 14:40:07 -0400 Subject: [PATCH] rbd: remove options_mimic.go moving content to options.go go-ceph stopped supporting mimic in v0.7.0. Keeping the constants that were added in mimic in a standalone file is no longer needed. Signed-off-by: John Mulligan --- rbd/options.go | 6 ++++++ rbd/options_mimic.go | 16 ---------------- 2 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 rbd/options_mimic.go diff --git a/rbd/options.go b/rbd/options.go index 86620b9..743beda 100644 --- a/rbd/options.go +++ b/rbd/options.go @@ -46,6 +46,12 @@ const ( // ImageOptionDataPool is the representation of RBD_IMAGE_OPTION_DATA_POOL // from librbd ImageOptionDataPool = C.RBD_IMAGE_OPTION_DATA_POOL + // ImageOptionFlatten is the representation of RBD_IMAGE_OPTION_FLATTEN + // from librbd + ImageOptionFlatten = C.RBD_IMAGE_OPTION_FLATTEN + // ImageOptionCloneFormat is the representation of + // RBD_IMAGE_OPTION_CLONE_FORMAT from librbd + ImageOptionCloneFormat = C.RBD_IMAGE_OPTION_CLONE_FORMAT // RbdImageOptionFormat deprecated alias for ImageOptionFormat RbdImageOptionFormat = ImageOptionFormat diff --git a/rbd/options_mimic.go b/rbd/options_mimic.go deleted file mode 100644 index 94f05bb..0000000 --- a/rbd/options_mimic.go +++ /dev/null @@ -1,16 +0,0 @@ -// +build !luminous - -package rbd - -// #include -import "C" - -const ( - // ImageOptionFlatten is the representation of RBD_IMAGE_OPTION_FLATTEN - // from librbd - ImageOptionFlatten = C.RBD_IMAGE_OPTION_FLATTEN - - // ImageOptionCloneFormat is the representation of - // RBD_IMAGE_OPTION_CLONE_FORMAT from librbd - ImageOptionCloneFormat = C.RBD_IMAGE_OPTION_CLONE_FORMAT -)