| Message ID | b42b4e2d067681b11ba85503802e8f3128485be9.1606938211.git.josef@toxicpanda.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Cleanup error handling in relocation | expand |
On 2020/12/3 上午3:50, Josef Bacik wrote: > record_root_in_trans can fail currently, so handle this failure > properly. > > Signed-off-by: Josef Bacik <josef@toxicpanda.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Thanks, Qu > --- > fs/btrfs/transaction.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c > index c17ab5194f5a..db676d99b098 100644 > --- a/fs/btrfs/transaction.c > +++ b/fs/btrfs/transaction.c > @@ -1436,7 +1436,9 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans, > * recorded root will never be updated again, causing an outdated root > * item. > */ > - record_root_in_trans(trans, src, 1); > + ret = record_root_in_trans(trans, src, 1); > + if (ret) > + return ret; > > /* > * We are going to commit transaction, see btrfs_commit_transaction() > @@ -1488,7 +1490,7 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans, > * insert_dir_item() > */ > if (!ret) > - record_root_in_trans(trans, parent, 1); > + ret = record_root_in_trans(trans, parent, 1); > return ret; > } > >
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index c17ab5194f5a..db676d99b098 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1436,7 +1436,9 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans, * recorded root will never be updated again, causing an outdated root * item. */ - record_root_in_trans(trans, src, 1); + ret = record_root_in_trans(trans, src, 1); + if (ret) + return ret; /* * We are going to commit transaction, see btrfs_commit_transaction() @@ -1488,7 +1490,7 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans, * insert_dir_item() */ if (!ret) - record_root_in_trans(trans, parent, 1); + ret = record_root_in_trans(trans, parent, 1); return ret; }
record_root_in_trans can fail currently, so handle this failure properly. Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- fs/btrfs/transaction.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)