bcachefs: Kill duplicate error code
PATCH 1/1 bcachefs: Kill duplicate error code
btree_node_read_error is duplicate of btree_node_read_err, which impacts repair path if misused.
--- fs/bcachefs/btree_io.c | 2 +- fs/bcachefs/errcode.h | 1 - fs/bcachefs/sb-errors_format.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-)
fs/bcachefs/btree_io.c +1 -1
@@ -1902,7 +1902,7 @@ static int __bch2_btree_root_read(struct btree_trans *trans, enum btree_id id, scoped_guard(mutex, &c->btree_cache.lock)bch2_btree_node_hash_remove (&c->btree_cache, b); - ret =bch_err_throw (c, btree_node_read_error); + ret =bch_err_throw (c, btree_node_read_err); goto err; }
fs/bcachefs/errcode.h +0 -1
@@ -295,7 +295,6 @@ x(BCH_ERR_btree_node_read_err, btree_node_read_err_cached) \ x(EIO, sb_not_downgraded) \ x(EIO, btree_node_write_all_failed) \ - x(EIO, btree_node_read_error) \ x(EIO, btree_need_topology_repair) \ x(EIO, bucket_ref_update) \x (EIO , trigger_alloc) \
fs/bcachefs/sb-errors_format.h +1 -1
@@ -73,7 +73,7 @@ enum bch_fsck_flags { x(btree_root_read_error, 59, FSCK_AUTOFIX) \ x(btree_root_bad_min_key, 60, 0) \ x(btree_root_bad_max_key, 61, 0) \ - x(btree_node_read_error, 62, FSCK_AUTOFIX) \ + x(btree_node_read_err, 62, FSCK_AUTOFIX) \ x(btree_node_topology_bad_min_key, 63, FSCK_AUTOFIX) \ x(btree_node_topology_bad_max_key, 64, FSCK_AUTOFIX) \x (btree_node_topology_bad_root_min_key,323 ,FSCK_AUTOFIX ) \
Signature · 1 line
2.49.0
Quoted 9 lines · Alan Huang
btree_node_read_erroris duplicate ofbtree_node_read_err, which impacts repair path if misused.Signed-off-by Alan Huang <[email protected]>--- fs/bcachefs/btree_io.c | 2 +- fs/bcachefs/errcode.h | 1 - fs/bcachefs/sb-errors_format.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-)
So the patch builds, but this still doesn't make sense, because
fs/bcachefs/btree_io.c static int __bch2_btree_root_read(struct btree_trans *trans, enum btree_id id, · line 1905
Quoted 11 lines
fs/bcachefs/btree_io.c +1
-1@@ -1902,7 +1902,7 @@ static int __bch2_btree_root_read(struct btree_trans *trans, enum btree_id id, scoped_guard(mutex, &c->btree_cache.lock)bch2_btree_node_hash_remove (&c->btree_cache, b); - ret =bch_err_throw (c, btree_node_read_error); + ret =bch_err_throw (c, btree_node_read_err);
this references an errcode.h error
fs/bcachefs/errcode.h line 298
Quoted 12 lines
fs/bcachefs/btree_io.c +0
-0goto err; }fs/bcachefs/errcode.h +0
-1@@ -295,7 +295,6 @@ x(BCH_ERR_btree_node_read_err, btree_node_read_err_cached) \ x(EIO, sb_not_downgraded) \x (EIO , btree_node_write_all_failed) \ -x (EIO , btree_node_read_error) \
which you delete
fs/bcachefs/sb-errors_format.h enum bch_fsck_flags { · line 76
Quoted 13 lines
fs/bcachefs/errcode.h +0
-0x(EIO, btree_need_topology_repair) \ x(EIO, bucket_ref_update) \x (EIO , trigger_alloc) \fs/bcachefs/sb-errors_format.h +1
-1@@ -73,7 +73,7 @@ enum bch_fsck_flags { x(btree_root_read_error, 59, FSCK_AUTOFIX) \ x(btree_root_bad_min_key, 60, 0) \ x(btree_root_bad_max_key, 61, 0) \ -x (btree_node_read_error,62 ,FSCK_AUTOFIX ) \ +x (btree_node_read_err,62 ,FSCK_AUTOFIX ) \
and rename the persistent error?
Quoted 6 lines
fs/bcachefs/sb-errors_format.h +0
-0x(btree_node_topology_bad_min_key, 63, FSCK_AUTOFIX) \ x(btree_node_topology_bad_max_key, 64, FSCK_AUTOFIX) \x (btree_node_topology_bad_root_min_key,323 ,FSCK_AUTOFIX ) \Signature · 1 line
2.49.0
Quoted 43 lines · Kent Overstreet
Quoted 9 lines · Alan Huang
btree_node_read_erroris duplicate ofbtree_node_read_err, which impacts repair path if misused.Signed-off-by Alan Huang <[email protected]>---
fs/bcachefs/btree_io.c | 2 +- fs/bcachefs/errcode.h | 1 - fs/bcachefs/sb-errors_format.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-)So the patch builds, but this still doesn't make sense, because
fs/bcachefs/btree_io.c static int __bch2_btree_root_read(struct btree_trans *trans, enum btree_id id, · line 1905
Quoted 11 lines
fs/bcachefs/btree_io.c +1
-1@@ -1902,7 +1902,7 @@ static int __bch2_btree_root_read(struct btree_trans *trans, enum btree_id id, scoped_guard(mutex, &c->btree_cache.lock)bch2_btree_node_hash_remove (&c->btree_cache, b); - ret =bch_err_throw (c, btree_node_read_error); + ret =bch_err_throw (c, btree_node_read_err);this references an
errcode.herrorfs/bcachefs/errcode.h line 298
Quoted 12 lines
fs/bcachefs/btree_io.c +0
-0goto err; }fs/bcachefs/errcode.h +0
-1@@ -295,7 +295,6 @@ x(BCH_ERR_btree_node_read_err, btree_node_read_err_cached) \ x(EIO, sb_not_downgraded) \x (EIO , btree_node_write_all_failed) \ -x (EIO , btree_node_read_error) \which you delete
Quoted 15 lines
fs/bcachefs/sb-errors_format.h enum bch_fsck_flags { · line 76
Quoted 13 lines
fs/bcachefs/errcode.h +0
-0x(EIO, btree_need_topology_repair) \ x(EIO, bucket_ref_update) \x (EIO , trigger_alloc) \fs/bcachefs/sb-errors_format.h +1
-1@@ -73,7 +73,7 @@ enum bch_fsck_flags { x(btree_root_read_error, 59, FSCK_AUTOFIX) \ x(btree_root_bad_min_key, 60, 0) \ x(btree_root_bad_max_key, 61, 0) \ -x (btree_node_read_error,62 ,FSCK_AUTOFIX ) \ +x (btree_node_read_err,62 ,FSCK_AUTOFIX ) \and rename the persistent error?
The persistent error is never used, renaming it to the same as the error in errcode.h makes sense.
Quoted 6 lines
Quoted 6 lines
fs/bcachefs/sb-errors_format.h +0
-0x(btree_node_topology_bad_min_key, 63, FSCK_AUTOFIX) \ x(btree_node_topology_bad_max_key, 64, FSCK_AUTOFIX) \x (btree_node_topology_bad_root_min_key,323 ,FSCK_AUTOFIX ) \Signature · 1 line
2.49.0
Quoted 60 lines · Alan Huang
Quoted 43 lines · Kent Overstreet
Quoted 9 lines · Alan Huang
btree_node_read_erroris duplicate ofbtree_node_read_err, which impacts repair path if misused.Signed-off-by Alan Huang <[email protected]>---
fs/bcachefs/btree_io.c | 2 +- fs/bcachefs/errcode.h | 1 - fs/bcachefs/sb-errors_format.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-)So the patch builds, but this still doesn't make sense, because
fs/bcachefs/btree_io.c static int __bch2_btree_root_read(struct btree_trans *trans, enum btree_id id, · line 1905
Quoted 11 lines
fs/bcachefs/btree_io.c +1
-1@@ -1902,7 +1902,7 @@ static int __bch2_btree_root_read(struct btree_trans *trans, enum btree_id id, scoped_guard(mutex, &c->btree_cache.lock)bch2_btree_node_hash_remove (&c->btree_cache, b); - ret =bch_err_throw (c, btree_node_read_error); + ret =bch_err_throw (c, btree_node_read_err);this references an
errcode.herrorfs/bcachefs/errcode.h line 298
Quoted 12 lines
fs/bcachefs/btree_io.c +0
-0goto err; }fs/bcachefs/errcode.h +0
-1@@ -295,7 +295,6 @@ x(BCH_ERR_btree_node_read_err, btree_node_read_err_cached) \ x(EIO, sb_not_downgraded) \x (EIO , btree_node_write_all_failed) \ -x (EIO , btree_node_read_error) \which you delete
Quoted 15 lines
fs/bcachefs/sb-errors_format.h enum bch_fsck_flags { · line 76
Quoted 13 lines
fs/bcachefs/errcode.h +0
-0x(EIO, btree_need_topology_repair) \ x(EIO, bucket_ref_update) \x (EIO , trigger_alloc) \fs/bcachefs/sb-errors_format.h +1
-1@@ -73,7 +73,7 @@ enum bch_fsck_flags { x(btree_root_read_error, 59, FSCK_AUTOFIX) \ x(btree_root_bad_min_key, 60, 0) \ x(btree_root_bad_max_key, 61, 0) \ -x (btree_node_read_error,62 ,FSCK_AUTOFIX ) \ +x (btree_node_read_err,62 ,FSCK_AUTOFIX ) \and rename the persistent error?
Quoted 1 line
The persistent error is never used, renaming it to the same as the error in
errcode.hmakes sense.
We probably want to hook it up then...