On Wed, Dec 16, 2020 at 11:26:18AM -0500, Josef Bacik wrote:
> We can create a reloc root when we record the root in the trans, which
> can fail for all sorts of different reasons. Propagate this error up
> the chain of callers. Future patches will fix the callers of
> btrfs_record_root_in_trans() to handle the error.
>
> Reviewed-by: Qu Wenruo <w...@suse.com>
> Reviewed-by: Johannes Thumshirn <johannes.thumsh...@wdc.com>
> Signed-off-by: Josef Bacik <jo...@toxicpanda.com>
> ---
> fs/btrfs/transaction.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
> index f51f9e39bcee..eba48578159e 100644
> --- a/fs/btrfs/transaction.c
> +++ b/fs/btrfs/transaction.c
> @@ -400,6 +400,7 @@ static int record_root_in_trans(struct btrfs_trans_handle
> *trans,
> int force)
> {
> struct btrfs_fs_info *fs_info = root->fs_info;
> + int ret = 0;
>
> if ((test_bit(BTRFS_ROOT_SHAREABLE, &root->state) &&
> root->last_trans < trans->transid) || force) {
> @@ -448,11 +449,11 @@ static int record_root_in_trans(struct
> btrfs_trans_handle *trans,
> * lock. smp_wmb() makes sure that all the writes above are
> * done before we pop in the zero below
> */
> - btrfs_init_reloc_root(trans, root);
> + ret = btrfs_init_reloc_root(trans, root);
This is patch 2 from the series and got me curious if it's ok to add the
error value check here, because that would mean that the whole callgraph
from btrfs_init_reloc_root is also error handling clean (ie. no
BUG_ONs).
And it's not until patch 19.
btrfs_init_reloc_root
create_reloc_root
kmalloc + BUG_ON
btrfs_copy_root + BUG_ON, twice
btrfs_insert_root + BUG_ON
btrfs_read_tree_root + BUG_ON
__add_reloc_root
...
All the patches in between add handling the record_root_in_trans errors,
which is fine as end result, but the proper error handling needs to be
pushed upwards from all leaf functions. That way it's cleaner and an
understandable pattern as we can review one step in the callgraph,
assuming that the calless are OK.
After reading the whole patchset it looks like the end result is more
or less what it should be but it's not a sequence of reviewable steps
patch-to-patch.
So it's patch ordering and maybe some context fixups, where the leaf
functions are BUG_ON-free and then all individual callers are updated.
Roughly in that order:
- __add_reloc_root
- create_reloc_root
- btrfs_init_reloc_root
- record_root_in_trans
- select_reloc_root
> smp_mb__before_atomic();
> clear_bit(BTRFS_ROOT_IN_TRANS_SETUP, &root->state);
> }
> - return 0;
> + return ret;
> }
>
>
> --
> 2.26.2
