leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocfs2: Pull ocfs2_xattr_value_buf up from __ocfs2_remove_xattr_range().

Browse Source 
Place an ocfs2_xattr_value_buf in __ocfs2_xattr_shrink_size() and pass
it down to __ocfs2_remove_xattr_range().

Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
Joel Becker 2008-12-09 14:30:41 -08:00 committed by Mark Fasheh
parent 2a50a743bd
commit d72cc72d57
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fs/ocfs2/xattr.c
View File

@ -636,8 +636,7 @@ leave:
} }
static int __ocfs2_remove_xattr_range(struct inode *inode, static int __ocfs2_remove_xattr_range(struct inode *inode,
struct buffer_head *root_bh, struct ocfs2_xattr_value_buf *vb,
struct ocfs2_xattr_value_root *xv,
u32 cpos, u32 phys_cpos, u32 len, u32 cpos, u32 phys_cpos, u32 len,
struct ocfs2_xattr_set_ctxt *ctxt) struct ocfs2_xattr_set_ctxt *ctxt)
{ {
@ -645,16 +644,11 @@ static int __ocfs2_remove_xattr_range(struct inode *inode,
u64 phys_blkno = ocfs2_clusters_to_blocks(inode->i_sb, phys_cpos); u64 phys_blkno = ocfs2_clusters_to_blocks(inode->i_sb, phys_cpos);
handle_t *handle = ctxt->handle; handle_t *handle = ctxt->handle;
struct ocfs2_extent_tree et; struct ocfs2_extent_tree et;
struct ocfs2_xattr_value_buf vb = {
.vb_bh = root_bh,
.vb_xv = xv,
.vb_access = ocfs2_journal_access,
};
ocfs2_init_xattr_value_extent_tree(&et, inode, &vb); ocfs2_init_xattr_value_extent_tree(&et, inode, vb);
ret = vb.vb_access(handle, inode, vb.vb_bh, ret = vb->vb_access(handle, inode, vb->vb_bh,
OCFS2_JOURNAL_ACCESS_WRITE); OCFS2_JOURNAL_ACCESS_WRITE);
if (ret) { if (ret) {
mlog_errno(ret); mlog_errno(ret);
goto out; goto out;
@ -667,9 +661,9 @@ static int __ocfs2_remove_xattr_range(struct inode *inode,
goto out; goto out;
} }
le32_add_cpu(&vb.vb_xv->xr_clusters, -len); le32_add_cpu(&vb->vb_xv->xr_clusters, -len);
ret = ocfs2_journal_dirty(handle, vb.vb_bh); ret = ocfs2_journal_dirty(handle, vb->vb_bh);
if (ret) { if (ret) {
mlog_errno(ret); mlog_errno(ret);
goto out; goto out;
@ -693,6 +687,11 @@ static int ocfs2_xattr_shrink_size(struct inode *inode,
int ret = 0; int ret = 0;
u32 trunc_len, cpos, phys_cpos, alloc_size; u32 trunc_len, cpos, phys_cpos, alloc_size;
u64 block; u64 block;
struct ocfs2_xattr_value_buf vb = {
.vb_bh = root_bh,
.vb_xv = xv,
.vb_access = ocfs2_journal_access,
};
if (old_clusters <= new_clusters) if (old_clusters <= new_clusters)
return 0; return 0;
@ -701,7 +700,8 @@ static int ocfs2_xattr_shrink_size(struct inode *inode,
trunc_len = old_clusters - new_clusters; trunc_len = old_clusters - new_clusters;
while (trunc_len) { while (trunc_len) {
ret = ocfs2_xattr_get_clusters(inode, cpos, &phys_cpos, ret = ocfs2_xattr_get_clusters(inode, cpos, &phys_cpos,
&alloc_size, &xv->xr_list); &alloc_size,
&vb.vb_xv->xr_list);
if (ret) { if (ret) {
mlog_errno(ret); mlog_errno(ret);
goto out; goto out;
@ -710,7 +710,7 @@ static int ocfs2_xattr_shrink_size(struct inode *inode,
if (alloc_size > trunc_len) if (alloc_size > trunc_len)
alloc_size = trunc_len; alloc_size = trunc_len;
ret = __ocfs2_remove_xattr_range(inode, root_bh, xv, cpos, ret = __ocfs2_remove_xattr_range(inode, &vb, cpos,
phys_cpos, alloc_size, phys_cpos, alloc_size,
ctxt); ctxt);
if (ret) { if (ret) {