btrfs: get rid of a BUG() in run_one_delayed_ref() and cleanups
cover btrfs: get rid of a BUG() in run_one_delayed_ref() and cleanups
From: Filipe Manana <[email protected]>
Remove a BUG() call in run_one_delayed_ref() and a couple trivial cleanups in that function.
Filipe Manana (3):
btrfs: don't BUG() on unexpected delayed ref type in run_one_delayed_ref()
btrfs: remove unnecessary else branch in run_one_delayed_ref()
btrfs: tag as unlikely error handling in run_one_delayed_ref()
fs/btrfs/extent-tree.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
Signature · 1 line
2.47.2
PATCH 1/3 btrfs: don't BUG() on unexpected delayed ref type in run_one_delayed_ref()
From: Filipe Manana <[email protected]>
There is no need to BUG(), we can just return an error and log an error message.
--- fs/btrfs/extent-tree.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
fs/btrfs/extent-tree.c +12 -8
@@ -1761,32 +1761,36 @@ static int run_one_delayed_ref(struct btrfs_trans_handle *trans, struct btrfs_delayed_extent_op *extent_op, bool insert_reserved) { +struct btrfs_fs_info *fs_info = trans->fs_info;int ret =0 ;if (TRANS_ABORTED (trans)) {if (insert_reserved) {btrfs_pin_extent (trans, node->bytenr, node->num_bytes); -free_head_ref_squota_rsv (trans->fs_info, href); +free_head_ref_squota_rsv (fs_info, href); }return 0 ; }if (node->type ==BTRFS_TREE_BLOCK_REF_KEY || - node->type ==BTRFS_SHARED_BLOCK_REF_KEY ) + node->type ==BTRFS_SHARED_BLOCK_REF_KEY ) { ret =run_delayed_tree_ref (trans, href, node, extent_op, insert_reserved); -else if (node->type ==BTRFS_EXTENT_DATA_REF_KEY || - node->type ==BTRFS_SHARED_DATA_REF_KEY ) + }else if (node->type ==BTRFS_EXTENT_DATA_REF_KEY || + node->type ==BTRFS_SHARED_DATA_REF_KEY ) { ret =run_delayed_data_ref (trans, href, node, extent_op, insert_reserved); -else if (node->type ==BTRFS_EXTENT_OWNER_REF_KEY ) + }else if (node->type ==BTRFS_EXTENT_OWNER_REF_KEY ) { ret =0 ; -else -BUG (); + }else { + ret = -EUCLEAN ; +btrfs_err (fs_info,"unexpected delayed ref node type: %u" , node->type); + } +if (ret && insert_reserved)btrfs_pin_extent (trans, node->bytenr, node->num_bytes);if (ret <0 ) -btrfs_err (trans->fs_info, +btrfs_err (fs_info,"failed to run delayed ref for logical %llu num_bytes %llu type %u action %u ref_mod %d: %d" , node->bytenr, node->num_bytes, node->type, node->action, node->ref_mod, ret);
Signature · 1 line
2.47.2
PATCH 2/3 btrfs: remove unnecessary else branch in run_one_delayed_ref()
In reply to [email protected]From: Filipe Manana <[email protected]>
There is no need for an else branch to deal with an unexpected delayed ref type. We can just change the previous branch to deal with this by checking if the ref type is not BTRFS_EXTENT_OWNER_REF_KEY, since that branch is useless as it only sets 'ret' to zero when it's already zero. So merge the two branches.
--- fs/btrfs/extent-tree.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/btrfs/extent-tree.c +1 -3
@@ -1780,9 +1780,7 @@ static int run_one_delayed_ref(struct btrfs_trans_handle *trans, node->type == BTRFS_SHARED_DATA_REF_KEY) { ret =run_delayed_data_ref (trans, href, node, extent_op, insert_reserved); - } else if (node->type == BTRFS_EXTENT_OWNER_REF_KEY) { - ret =0 ; - } else { + } else if (node->type != BTRFS_EXTENT_OWNER_REF_KEY) { ret = -EUCLEAN ;btrfs_err (fs_info,"unexpected delayed ref node type: %u" , node->type); }
Signature · 1 line
2.47.2
PATCH 3/3 btrfs: tag as unlikely error handling in run_one_delayed_ref()
In reply to [email protected]From: Filipe Manana <[email protected]>
We don't expect to get errors unless we have a corrupted fs, bad ram or a bug. So tag the error handling as unlikely.
This slightly reduces the module's text size on x86_64 using gcc 14.2.0-19 from Debian.
Before this change:
$ size fs/btrfs/btrfs.ko
text data bss dec hex filename
1939458 172512 15592 2127562 2076ca fs/btrfs/btrfs.koAfter this change:
$ size fs/btrfs/btrfs.ko
text data bss dec hex filename
1939398 172512 15592 2127502 20768e fs/btrfs/btrfs.ko--- fs/btrfs/extent-tree.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
fs/btrfs/extent-tree.c +5 -3
@@ -1785,13 +1785,15 @@ static int run_one_delayed_ref(struct btrfs_trans_handle *trans,btrfs_err (fs_info,"unexpected delayed ref node type: %u" , node->type); } -if (ret && insert_reserved) -btrfs_pin_extent (trans, node->bytenr, node->num_bytes); -if (ret <0 ) +if (unlikely (ret)) { +if (insert_reserved) +btrfs_pin_extent (trans, node->bytenr, node->num_bytes);btrfs_err (fs_info,"failed to run delayed ref for logical %llu num_bytes %llu type %u action %u ref_mod %d: %d" , node->bytenr, node->num_bytes, node->type, node->action, node->ref_mod, ret); + } +return ret; }
Signature · 1 line
2.47.2
Quoted 4 lines · On Tue, Jan 13, 2026 at 04:50:56PM +0000, [email protected] wrote:
From: Filipe Manana <[email protected]>
Remove a
BUG()call inrun_one_delayed_ref()and a couple trivial cleanups in that function.
Quoted 12 lines
Filipe Manana (3):
btrfs: don'tBUG()on unexpected delayed ref type inrun_one_delayed_ref()
btrfs: remove unnecessary else branch inrun_one_delayed_ref()
btrfs: tag as unlikely error handling inrun_one_delayed_ref()fs/btrfs/extent-tree.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)Signature · 1 line
2.47.2
Quoted 4 lines · 在 2026/1/14 03:20, [email protected] 写道:
From: Filipe Manana <[email protected]>
Remove a
BUG()call inrun_one_delayed_ref()and a couple trivial cleanups in that function.
Thanks,
Qu
Quoted 9 lines
Filipe Manana (3):
btrfs: don'tBUG()on unexpected delayed ref type inrun_one_delayed_ref()
btrfs: remove unnecessary else branch inrun_one_delayed_ref()
btrfs: tag as unlikely error handling inrun_one_delayed_ref()fs/btrfs/extent-tree.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)