Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

ocfs2/xattr: Move clusters free into dealloc.

Browse Source 
Move clusters free process into dealloc context so that
they can be freed after the transaction.

Signed-off-by: Tao Ma <tao.ma@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
Tao Ma 2008-11-12 08:26:59 +08:00 committed by Mark Fasheh
parent 2891d290aa
commit c73f60f900
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/ocfs2/xattr.c
View File

@ -457,7 +457,6 @@ static int __ocfs2_remove_xattr_range(struct inode *inode,
int ret;
u64 phys_blkno = ocfs2_clusters_to_blocks(inode->i_sb, phys_cpos);
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct inode *tl_inode = osb->osb_tl_inode;
handle_t *handle;
struct ocfs2_alloc_context *meta_ac = NULL;
struct ocfs2_extent_tree et;
@ -470,16 +469,6 @@ static int __ocfs2_remove_xattr_range(struct inode *inode,
return ret;
}
mutex_lock(&tl_inode->i_mutex);
if (ocfs2_truncate_log_needs_flush(osb)) {
ret = __ocfs2_flush_truncate_log(osb);
if (ret < 0) {
mlog_errno(ret);
goto out;
}
}
handle = ocfs2_start_trans(osb, OCFS2_REMOVE_EXTENT_CREDITS);
if (IS_ERR(handle)) {
ret = PTR_ERR(handle);
@ -509,14 +498,13 @@ static int __ocfs2_remove_xattr_range(struct inode *inode,
goto out_commit;
}
ret = ocfs2_truncate_log_append(osb, handle, phys_blkno, len);
ret = ocfs2_cache_cluster_dealloc(dealloc, phys_blkno, len);
if (ret)
mlog_errno(ret);
out_commit:
ocfs2_commit_trans(osb, handle);
out:
mutex_unlock(&tl_inode->i_mutex);
if (meta_ac)
ocfs2_free_alloc_context(meta_ac);