| Message ID | 348d8accd247be56cbc57597aadaa46c85f0a5b8.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: > btrfs_record_root_in_trans will return errors in the future, so handle > the error properly in btrfs_delete_subvolume. > > Signed-off-by: Josef Bacik <josef@toxicpanda.com> Reveiwed-by: Qu Wenruo <wqu@suse.com> Thanks, Qu > --- > fs/btrfs/inode.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c > index 40601a0ff4f2..1f9fa63ef194 100644 > --- a/fs/btrfs/inode.c > +++ b/fs/btrfs/inode.c > @@ -4157,7 +4157,11 @@ int btrfs_delete_subvolume(struct inode *dir, struct dentry *dentry) > goto out_end_trans; > } > > - btrfs_record_root_in_trans(trans, dest); > + ret = btrfs_record_root_in_trans(trans, dest); > + if (ret) { > + btrfs_abort_transaction(trans, ret); > + goto out_end_trans; > + } > > memset(&dest->root_item.drop_progress, 0, > sizeof(dest->root_item.drop_progress)); >
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 40601a0ff4f2..1f9fa63ef194 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4157,7 +4157,11 @@ int btrfs_delete_subvolume(struct inode *dir, struct dentry *dentry) goto out_end_trans; } - btrfs_record_root_in_trans(trans, dest); + ret = btrfs_record_root_in_trans(trans, dest); + if (ret) { + btrfs_abort_transaction(trans, ret); + goto out_end_trans; + } memset(&dest->root_item.drop_progress, 0, sizeof(dest->root_item.drop_progress));
btrfs_record_root_in_trans will return errors in the future, so handle the error properly in btrfs_delete_subvolume. Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- fs/btrfs/inode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)