Update bcachefs sources to 841a95c29f4c bcachefs: fix userspace build errors

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

diff --git a/libbcachefs/recovery_types.h b/libbcachefs/recovery_types.h
index 515e3d62c2ac9ec481694985ddaa7b1722760d6f..c6deceb66dfb60093b2338b497878631d416c6a0 100644 (file)
--- a/libbcachefs/recovery_types.h
+++ b/libbcachefs/recovery_types.h
@@ -6,43 +6,44 @@
 #define PASS_FSCK              BIT(1)
 #define PASS_UNCLEAN           BIT(2)
 #define PASS_ALWAYS            BIT(3)
+#define PASS_ONLINE            BIT(4)
 
-#define BCH_RECOVERY_PASSES()                                                                  \
-       x(alloc_read,                   PASS_ALWAYS)                                            \
-       x(stripes_read,                 PASS_ALWAYS)                                            \
-       x(initialize_subvolumes,        0)                                                      \
-       x(snapshots_read,               PASS_ALWAYS)                                            \
-       x(check_topology,               0)                                                      \
-       x(check_allocations,            PASS_FSCK)                                              \
-       x(trans_mark_dev_sbs,           PASS_ALWAYS|PASS_SILENT)                                \
-       x(fs_journal_alloc,             PASS_ALWAYS|PASS_SILENT)                                \
-       x(set_may_go_rw,                PASS_ALWAYS|PASS_SILENT)                                \
-       x(journal_replay,               PASS_ALWAYS)                                            \
-       x(check_alloc_info,             PASS_FSCK)                                              \
-       x(check_lrus,                   PASS_FSCK)                                              \
-       x(check_btree_backpointers,     PASS_FSCK)                                              \
-       x(check_backpointers_to_extents,PASS_FSCK)                                              \
-       x(check_extents_to_backpointers,PASS_FSCK)                                              \
-       x(check_alloc_to_lru_refs,      PASS_FSCK)                                              \
-       x(fs_freespace_init,            PASS_ALWAYS|PASS_SILENT)                                \
-       x(bucket_gens_init,             0)                                                      \
-       x(check_snapshot_trees,         PASS_FSCK)                                              \
-       x(check_snapshots,              PASS_FSCK)                                              \
-       x(check_subvols,                PASS_FSCK)                                              \
-       x(delete_dead_snapshots,        PASS_FSCK)                                              \
-       x(fs_upgrade_for_subvolumes,    0)                                                      \
-       x(resume_logged_ops,            PASS_ALWAYS)                                            \
-       x(check_inodes,                 PASS_FSCK)                                              \
-       x(check_extents,                PASS_FSCK)                                              \
-       x(check_indirect_extents,       PASS_FSCK)                                              \
-       x(check_dirents,                PASS_FSCK)                                              \
-       x(check_xattrs,                 PASS_FSCK)                                              \
-       x(check_root,                   PASS_FSCK)                                              \
-       x(check_directory_structure,    PASS_FSCK)                                              \
-       x(check_nlinks,                 PASS_FSCK)                                              \
-       x(delete_dead_inodes,           PASS_FSCK|PASS_UNCLEAN)                                 \
-       x(fix_reflink_p,                0)                                                      \
-       x(set_fs_needs_rebalance,       0)                                                      \
+#define BCH_RECOVERY_PASSES()                                                  \
+       x(alloc_read,                           PASS_ALWAYS)                    \
+       x(stripes_read,                         PASS_ALWAYS)                    \
+       x(initialize_subvolumes,                0)                              \
+       x(snapshots_read,                       PASS_ALWAYS)                    \
+       x(check_topology,                       0)                              \
+       x(check_allocations,                    PASS_FSCK)                      \
+       x(trans_mark_dev_sbs,                   PASS_ALWAYS|PASS_SILENT)        \
+       x(fs_journal_alloc,                     PASS_ALWAYS|PASS_SILENT)        \
+       x(set_may_go_rw,                        PASS_ALWAYS|PASS_SILENT)        \
+       x(journal_replay,                       PASS_ALWAYS)                    \
+       x(check_alloc_info,                     PASS_ONLINE|PASS_FSCK)          \
+       x(check_lrus,                           PASS_ONLINE|PASS_FSCK)          \
+       x(check_btree_backpointers,             PASS_ONLINE|PASS_FSCK)          \
+       x(check_backpointers_to_extents,        PASS_ONLINE|PASS_FSCK)          \
+       x(check_extents_to_backpointers,        PASS_ONLINE|PASS_FSCK)          \
+       x(check_alloc_to_lru_refs,              PASS_ONLINE|PASS_FSCK)          \
+       x(fs_freespace_init,                    PASS_ALWAYS|PASS_SILENT)        \
+       x(bucket_gens_init,                     0)                              \
+       x(check_snapshot_trees,                 PASS_ONLINE|PASS_FSCK)          \
+       x(check_snapshots,                      PASS_ONLINE|PASS_FSCK)          \
+       x(check_subvols,                        PASS_ONLINE|PASS_FSCK)          \
+       x(delete_dead_snapshots,                PASS_ONLINE|PASS_FSCK)          \
+       x(fs_upgrade_for_subvolumes,            0)                              \
+       x(resume_logged_ops,                    PASS_ALWAYS)                    \
+       x(check_inodes,                         PASS_FSCK)                      \
+       x(check_extents,                        PASS_FSCK)                      \
+       x(check_indirect_extents,               PASS_FSCK)                      \
+       x(check_dirents,                        PASS_FSCK)                      \
+       x(check_xattrs,                         PASS_FSCK)                      \
+       x(check_root,                           PASS_ONLINE|PASS_FSCK)          \
+       x(check_directory_structure,            PASS_FSCK)                      \
+       x(check_nlinks,                         PASS_FSCK)                      \
+       x(delete_dead_inodes,                   PASS_FSCK|PASS_UNCLEAN)         \
+       x(fix_reflink_p,                        0)                              \
+       x(set_fs_needs_rebalance,               0)                              \
 
 enum bch_recovery_pass {
 #define x(n, when)     BCH_RECOVERY_PASS_##n,