| Message ID | 5ef2aa527f3a9e0525ab5a97ef0d585b999bb47c.1605284383.git.josef@toxicpanda.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,01/42] btrfs: allow error injection for btrfs_search_slot and btrfs_cow_block | expand |
On 13.11.20 г. 18:22 ч., 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 It seems it can only fail due to a single reason and that being -ENOMEM in __add_reloc_root (see below), because create_reloc_root BUGS on error. > the chain of callers. Future patches will fix the callers of > btrfs_record_root_in_trans() to handle the error. > > Signed-off-by: Josef Bacik <josef@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 0e4063651047..fab26241fb2e 100644 > --- a/fs/btrfs/transaction.c > +++ b/fs/btrfs/transaction.c > @@ -403,6 +403,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) { > @@ -451,11 +452,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); In order for this value to have any effect btrfs_init_reloc_root ought to also be changed because it either always returns 0 or BUG_ON() on -ENOMEM from __ad_reloc_root. <snip>
On 24.11.20 г. 13:02 ч., Nikolay Borisov wrote: > effect btrfs_init_reloc_root ought > to also be changed because it either always returns 0 or BUG_ON() on > -ENOMEM from __ad_reloc_root. Ok, you do the necessary changes in patch 21, so disregard this.
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 0e4063651047..fab26241fb2e 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -403,6 +403,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) { @@ -451,11 +452,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); smp_mb__before_atomic(); clear_bit(BTRFS_ROOT_IN_TRANS_SETUP, &root->state); } - return 0; + return ret; }
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. Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- fs/btrfs/transaction.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)