update ceph source to reef 18.1.2

[ceph.git] / ceph / src / pybind / rbd / c_rbd.pxd

diff --git a/ceph/src/pybind/rbd/c_rbd.pxd b/ceph/src/pybind/rbd/c_rbd.pxd
index 275984209f79a94b3e68f4386174e2af58c1afab..885f7bd46abde8e6d379c256f9c0de910a1a1061 100644 (file)
--- a/ceph/src/pybind/rbd/c_rbd.pxd
+++ b/ceph/src/pybind/rbd/c_rbd.pxd
@@ -265,6 +265,7 @@ cdef extern from "rbd/librbd.h" nogil:
     ctypedef enum rbd_encryption_format_t:
         _RBD_ENCRYPTION_FORMAT_LUKS1 "RBD_ENCRYPTION_FORMAT_LUKS1"
         _RBD_ENCRYPTION_FORMAT_LUKS2 "RBD_ENCRYPTION_FORMAT_LUKS2"
+        _RBD_ENCRYPTION_FORMAT_LUKS "RBD_ENCRYPTION_FORMAT_LUKS"
 
     ctypedef enum rbd_encryption_algorithm_t:
         _RBD_ENCRYPTION_ALGORITHM_AES128 "RBD_ENCRYPTION_ALGORITHM_AES128"
@@ -280,8 +281,17 @@ cdef extern from "rbd/librbd.h" nogil:
         const char* passphrase
         size_t passphrase_size
 
+    ctypedef struct rbd_encryption_luks_format_options_t:
+        const char* passphrase
+        size_t passphrase_size
+
     ctypedef void* rbd_encryption_options_t
 
+    ctypedef struct rbd_encryption_spec_t:
+        rbd_encryption_format_t format
+        rbd_encryption_options_t opts
+        size_t opts_size
+
     ctypedef void (*rbd_callback_t)(rbd_completion_t cb, void *arg)
 
     void rbd_version(int *major, int *minor, int *extra)
@@ -715,5 +725,8 @@ cdef extern from "rbd/librbd.h" nogil:
                               rbd_encryption_format_t format,
                               rbd_encryption_options_t opts, size_t opts_size)
     int rbd_encryption_load(rbd_image_t image,
-                              rbd_encryption_format_t format,
-                              rbd_encryption_options_t opts, size_t opts_size)
+                            rbd_encryption_format_t format,
+                            rbd_encryption_options_t opts, size_t opts_size)
+    int rbd_encryption_load2(rbd_image_t image,
+                             const rbd_encryption_spec_t *specs,
+                             size_t spec_count)