From 0ffebd1f25e52db29c739cc129f2415319b657f0 Mon Sep 17 00:00:00 2001 From: Mudit Agarwal Date: Thu, 25 Jun 2020 18:53:16 +0530 Subject: [PATCH] rbd: moved ImageOptionCloneFormat to rbd/options_mimic.go RBD_IMAGE_OPTION_CLONE_FORMAT was added in Ceph Mimic but fix for issue #295 added it only for Ceph Nautilus, moving it to rbd/options_mimic.go Signed-off-by: Mudit Agarwal --- rbd/options_mimic.go | 4 ++++ rbd/options_nautilus.go | 12 ------------ 2 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 rbd/options_nautilus.go diff --git a/rbd/options_mimic.go b/rbd/options_mimic.go index 5ea1c5b..94f05bb 100644 --- a/rbd/options_mimic.go +++ b/rbd/options_mimic.go @@ -9,4 +9,8 @@ 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 ) diff --git a/rbd/options_nautilus.go b/rbd/options_nautilus.go deleted file mode 100644 index e1d13c2..0000000 --- a/rbd/options_nautilus.go +++ /dev/null @@ -1,12 +0,0 @@ -// +build !luminous,!mimic - -package rbd - -// #include -import "C" - -const ( - // ImageOptionCloneFormat is the representation of - // RBD_IMAGE_OPTION_CLONE_FORMAT from librbd - ImageOptionCloneFormat = C.RBD_IMAGE_OPTION_CLONE_FORMAT -)