Disable pristine-tar option in gbp.conf, since there is no pristine-tar branch.

[bcachefs-tools-debian] / libbcachefs / subvolume_types.h

diff --git a/libbcachefs/subvolume_types.h b/libbcachefs/subvolume_types.h
index c596e4270690baf4193b73d29c63b50c5351da5f..40f16e3a6dd04f1e14ae493665c07eb86e9b2737 100644 (file)
--- a/libbcachefs/subvolume_types.h
+++ b/libbcachefs/subvolume_types.h
@@ -2,10 +2,12 @@
 #ifndef _BCACHEFS_SUBVOLUME_TYPES_H
 #define _BCACHEFS_SUBVOLUME_TYPES_H
 
-#include "darray.h"
+#include <linux/darray_types.h>
 
 typedef DARRAY(u32) snapshot_id_list;
 
+#define IS_ANCESTOR_BITMAP     128
+
 struct snapshot_t {
        u32                     parent;
        u32                     skip[3];
@@ -14,10 +16,15 @@ struct snapshot_t {
        u32                     subvol; /* Nonzero only if a subvolume points to this node: */
        u32                     tree;
        u32                     equiv;
+       unsigned long           is_ancestor[BITS_TO_LONGS(IS_ANCESTOR_BITMAP)];
 };
 
 struct snapshot_table {
+#ifndef RUST_BINDGEN
+       DECLARE_FLEX_ARRAY(struct snapshot_t, s);
+#else
        struct snapshot_t       s[0];
+#endif
 };
 
 typedef struct {