| Message ID | 51B587EF.1090501@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/10/2013 04:01 PM, Joseph Qi wrote: > In ocfs2_remove_btree_range, when calling ocfs2_lock_refcount_tree and > ocfs2_prepare_refcount_change_for_del failed, it goes to out and then > tries to call mutex_unlock without mutex_lock before. > And when calling ocfs2_reserve_blocks_for_rec_trunc > failed, it should free ref_tree before return. > > > Signed-off-by: Joseph Qi <joseph.qi@huawei.com> Reviewed-by: Jie Liu <jeff.liu@oracle.com> > --- > fs/ocfs2/alloc.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c > index b8a9d87..17e6bdd 100644 > --- a/fs/ocfs2/alloc.c > +++ b/fs/ocfs2/alloc.c > @@ -5655,7 +5655,7 @@ int ocfs2_remove_btree_range(struct inode *inode, > &ref_tree, NULL); > if (ret) { > mlog_errno(ret); > - goto out; > + goto bail; > } > > ret = ocfs2_prepare_refcount_change_for_del(inode, > @@ -5666,7 +5666,7 @@ int ocfs2_remove_btree_range(struct inode *inode, > &extra_blocks); > if (ret < 0) { > mlog_errno(ret); > - goto out; > + goto bail; > } > } > > @@ -5674,7 +5674,7 @@ int ocfs2_remove_btree_range(struct inode *inode, > extra_blocks); > if (ret) { > mlog_errno(ret); > - return ret; > + goto bail; > } > > mutex_lock(&tl_inode->i_mutex); > @@ -5734,7 +5734,7 @@ out_commit: > ocfs2_commit_trans(osb, handle); > out: > mutex_unlock(&tl_inode->i_mutex); > - > +bail: > if (meta_ac) > ocfs2_free_alloc_context(meta_ac); > > -- 1.7.9.7
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index b8a9d87..17e6bdd 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -5655,7 +5655,7 @@ int ocfs2_remove_btree_range(struct inode *inode, &ref_tree, NULL); if (ret) { mlog_errno(ret); - goto out; + goto bail; } ret = ocfs2_prepare_refcount_change_for_del(inode, @@ -5666,7 +5666,7 @@ int ocfs2_remove_btree_range(struct inode *inode, &extra_blocks); if (ret < 0) { mlog_errno(ret); - goto out; + goto bail; } } @@ -5674,7 +5674,7 @@ int ocfs2_remove_btree_range(struct inode *inode, extra_blocks); if (ret) { mlog_errno(ret); - return ret; + goto bail; } mutex_lock(&tl_inode->i_mutex); @@ -5734,7 +5734,7 @@ out_commit: ocfs2_commit_trans(osb, handle); out: mutex_unlock(&tl_inode->i_mutex); - +bail: if (meta_ac) ocfs2_free_alloc_context(meta_ac);
In ocfs2_remove_btree_range, when calling ocfs2_lock_refcount_tree and ocfs2_prepare_refcount_change_for_del failed, it goes to out and then tries to call mutex_unlock without mutex_lock before. And when calling ocfs2_reserve_blocks_for_rec_trunc failed, it should free ref_tree before return. Signed-off-by: Joseph Qi <joseph.qi@huawei.com> --- fs/ocfs2/alloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)