Update bcachefs sources to f7ccf51390 bcachefs: durability

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

diff --git a/libbcachefs/bkey.h b/libbcachefs/bkey.h
index dc0b88f75ebe4a4934988ef465afeef131a106d4..f665e2e138bf314a136e115125253cf14492a902 100644 (file)
--- a/libbcachefs/bkey.h
+++ b/libbcachefs/bkey.h
@@ -7,8 +7,11 @@
 #include "util.h"
 #include "vstructs.h"
 
+#ifdef CONFIG_X86_64
+#define HAVE_BCACHEFS_COMPILED_UNPACK  1
+#endif
+
 void bch2_to_binary(char *, const u64 *, unsigned);
-int bch2_bkey_to_text(char *, size_t, const struct bkey *);
 
 #define BKEY_PADDED(key)       __BKEY_PADDED(key, BKEY_EXTENT_VAL_U64s_MAX)
 
@@ -377,12 +380,12 @@ static inline u64 bkey_field_max(const struct bkey_format *f,
                                 enum bch_bkey_fields nr)
 {
        return f->bits_per_field[nr] < 64
-               ? f->field_offset[nr] + ~(~0ULL << f->bits_per_field[nr])
+               ? (le64_to_cpu(f->field_offset[nr]) +
+                  ~(~0ULL << f->bits_per_field[nr]))
                : U64_MAX;
 }
 
-#ifdef CONFIG_X86_64
-#define HAVE_BCACHEFS_COMPILED_UNPACK  1
+#ifdef HAVE_BCACHEFS_COMPILED_UNPACK
 
 int bch2_compile_bkey_format(const struct bkey_format *, void *);
 
@@ -583,6 +586,8 @@ BKEY_VAL_ACCESSORS(xattr,           BCH_XATTR);
 
 BKEY_VAL_ACCESSORS(alloc,              BCH_ALLOC);
 
+BKEY_VAL_ACCESSORS(quota,              BCH_QUOTA);
+
 /* byte order helpers */
 
 #if !defined(__LITTLE_ENDIAN) && !defined(__BIG_ENDIAN)