| Message ID | 1364209703-1590-1-git-send-email-wangshilong1991@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, March 25, 2013 at 12:08 (+0100), Wang Shilong wrote: > From: Wang Shilong <wangsl-fnst@cn.fujitsu.com> > > The function btrfs_find_all_roots is responsible to allocate > memory for 'roots' and free it if errors happen,so the caller should not > free it again since the work has been done. > > Besides,'tmp' is allocated after the function btrfs_find_all_roots, > so we can return directly if btrfs_find_all_roots() fails. > > Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com> > Reviewed-by: Miao Xie <miaox@cn.fujitsu.com> > --- > fs/btrfs/qgroup.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c > index 1aff3a8..e3598fa 100644 > --- a/fs/btrfs/qgroup.c > +++ b/fs/btrfs/qgroup.c > @@ -1208,7 +1208,7 @@ int btrfs_qgroup_account_ref(struct btrfs_trans_handle *trans, > ret = btrfs_find_all_roots(trans, fs_info, node->bytenr, > sgn > 0 ? node->seq - 1 : node->seq, &roots); > if (ret < 0) > - goto out; > + return ret; > > spin_lock(&fs_info->qgroup_lock); > quota_root = fs_info->quota_root; > @@ -1330,7 +1330,6 @@ int btrfs_qgroup_account_ref(struct btrfs_trans_handle *trans, > ret = 0; > unlock: > spin_unlock(&fs_info->qgroup_lock); > -out: > ulist_free(roots); > ulist_free(tmp); > > Reviewed-by: Jan Schmidt <list.btrfs@jan-o-sch.net> Thanks! -Jan -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 1aff3a8..e3598fa 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1208,7 +1208,7 @@ int btrfs_qgroup_account_ref(struct btrfs_trans_handle *trans, ret = btrfs_find_all_roots(trans, fs_info, node->bytenr, sgn > 0 ? node->seq - 1 : node->seq, &roots); if (ret < 0) - goto out; + return ret; spin_lock(&fs_info->qgroup_lock); quota_root = fs_info->quota_root; @@ -1330,7 +1330,6 @@ int btrfs_qgroup_account_ref(struct btrfs_trans_handle *trans, ret = 0; unlock: spin_unlock(&fs_info->qgroup_lock); -out: ulist_free(roots); ulist_free(tmp);