bcachefs: Add upgrade table entry from 0.14

There are a few errors that needed to be marked as autofix.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/sb-downgrade.c b/fs/bcachefs/sb-downgrade.c
index acb5d845841e537fd2054e7056aec84cd26b2905..badd0e17ada5a0ee016c8394026f2b19ce60d2f3 100644 (file)
--- a/fs/bcachefs/sb-downgrade.c
+++ b/fs/bcachefs/sb-downgrade.c
@@ -20,6 +20,10 @@
  * x(version, recovery_passes, errors...)
  */
 #define UPGRADE_TABLE()                                                \
+       x(snapshot_2,                                           \
+         RECOVERY_PASS_ALL_FSCK,                               \
+         BCH_FSCK_ERR_subvol_root_wrong_bi_subvol,             \
+         BCH_FSCK_ERR_subvol_not_master_and_not_snapshot)      \
        x(backpointers,                                         \
          RECOVERY_PASS_ALL_FSCK)                               \
        x(inode_v3,                                             \

diff --git a/fs/bcachefs/sb-errors_format.h b/fs/bcachefs/sb-errors_format.h
index dc53d25c7cbb005e6d69de05f9e342f962d4d3cd..3711aa5009ac350dc58d567af9ae5ce3de0a2f14 100644 (file)
--- a/fs/bcachefs/sb-errors_format.h
+++ b/fs/bcachefs/sb-errors_format.h
@@ -205,9 +205,9 @@ enum bch_fsck_flags {
        x(snapshot_bad_depth,                                   184,    0)              \
        x(snapshot_bad_skiplist,                                185,    0)              \
        x(subvol_pos_bad,                                       186,    0)              \
-       x(subvol_not_master_and_not_snapshot,                   187,    0)              \
+       x(subvol_not_master_and_not_snapshot,                   187,    FSCK_AUTOFIX)   \
        x(subvol_to_missing_root,                               188,    0)              \
-       x(subvol_root_wrong_bi_subvol,                          189,    0)              \
+       x(subvol_root_wrong_bi_subvol,                          189,    FSCK_AUTOFIX)   \
        x(bkey_in_missing_snapshot,                             190,    0)              \
        x(inode_pos_inode_nonzero,                              191,    0)              \
        x(inode_pos_blockdev_range,                             192,    0)              \