From: Nikita Ofitserov <himikof@gmail.com>
Date: Sun, 4 Jan 2026 21:54:39 +0000 (+0300)
Subject: libblkid: (bcachefs) add new bcachefs_sb_member fields
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ddac733bdbdacb17b3c1d45cc9e300e4cbac85f;p=thirdparty%2Futil-linux.git

libblkid: (bcachefs) add new bcachefs_sb_member fields

This is now in sync with bcachefs 1.34.

Signed-off-by: Nikita Ofitserov <himikof@gmail.com>
---

diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c
index 10b1c8296..b155242a3 100644
--- a/libblkid/src/superblocks/bcache.c
+++ b/libblkid/src/superblocks/bcache.c
@@ -79,9 +79,23 @@ struct bcachefs_sb_member {
 	uint64_t	nbuckets;
 	uint16_t	first_bucket;
 	uint16_t	bucket_size;
-	uint32_t	pad;
+	uint8_t		btree_bitmap_shift;
+	uint8_t		pad[3];
 	uint64_t	last_mount;
-	uint64_t	flags[2];
+	uint64_t	flags;
+	/* fields below were added after members_v1 */
+	uint32_t	iops[4];
+	uint64_t	errors[3];
+	uint64_t	errors_at_reset[3];
+	uint64_t	errors_reset_time;
+	uint64_t	seq;
+	uint64_t	btree_allocated_bitmap;
+	uint32_t	last_journal_bucket;
+	uint32_t	last_journal_bucket_offset;
+
+	/* device name/model info from the last FS mount */
+	uint8_t		device_name[16];
+	uint8_t		device_model[64];
 } __attribute__((packed));
 
 struct bcachefs_sb_field_members_v1 {