#define BKEY_BTREE_PTR_U64s_MAX                                        \
        (BKEY_U64s + BKEY_BTREE_PTR_VAL_U64s_MAX)
 
-/* Xattrs */
-
-#define KEY_TYPE_XATTR_INDEX_USER                      0
-#define KEY_TYPE_XATTR_INDEX_POSIX_ACL_ACCESS  1
-#define KEY_TYPE_XATTR_INDEX_POSIX_ACL_DEFAULT 2
-#define KEY_TYPE_XATTR_INDEX_TRUSTED                   3
-#define KEY_TYPE_XATTR_INDEX_SECURITY          4
-
-struct bch_xattr {
-       struct bch_val          v;
-       __u8                    x_type;
-       __u8                    x_name_len;
-       __le16                  x_val_len;
-       __u8                    x_name[];
-} __packed __aligned(8);
 
 /* Bucket/allocation information: */
 
 
 #include "dirent_format.h"
 #include "inode_format.h"
+#include "xattr_format.h"
 #include "quota_format.h"
 #include "sb-counters_format.h"
 
 
--- /dev/null
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _BCACHEFS_XATTR_FORMAT_H
+#define _BCACHEFS_XATTR_FORMAT_H
+
+#define KEY_TYPE_XATTR_INDEX_USER              0
+#define KEY_TYPE_XATTR_INDEX_POSIX_ACL_ACCESS  1
+#define KEY_TYPE_XATTR_INDEX_POSIX_ACL_DEFAULT 2
+#define KEY_TYPE_XATTR_INDEX_TRUSTED           3
+#define KEY_TYPE_XATTR_INDEX_SECURITY          4
+
+struct bch_xattr {
+       struct bch_val          v;
+       __u8                    x_type;
+       __u8                    x_name_len;
+       __le16                  x_val_len;
+       __u8                    x_name[];
+} __packed __aligned(8);
+
+#endif /* _BCACHEFS_XATTR_FORMAT_H */