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