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

ocfs2: Pull ocfs2_xattr_value_buf up into ocfs2_xattr_value_truncate().

Browse Source 
Place an ocfs2_xattr_value_buf in ocfs2_xattr_value_truncate() and pass
it down to ocfs2_xattr_shrink_size().  We can also pass it into
ocfs2_xattr_extend_allocation(), replacing its ocfs2_xattr_value_buf.

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:36:50 -08:00 committed by Mark Fasheh
parent d72cc72d57
commit 19b801f45f
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
fs/ocfs2/xattr.c
View File

@ -573,34 +573,28 @@ int ocfs2_calc_xattr_init(struct inode *dir,
static int ocfs2_xattr_extend_allocation(struct inode *inode, static int ocfs2_xattr_extend_allocation(struct inode *inode,
u32 clusters_to_add, u32 clusters_to_add,
struct buffer_head *xattr_bh, struct ocfs2_xattr_value_buf *vb,
struct ocfs2_xattr_value_root *xv,
struct ocfs2_xattr_set_ctxt *ctxt) struct ocfs2_xattr_set_ctxt *ctxt)
{ {
int status = 0; int status = 0;
handle_t *handle = ctxt->handle; handle_t *handle = ctxt->handle;
enum ocfs2_alloc_restarted why; enum ocfs2_alloc_restarted why;
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_xattr_value_buf vb = { u32 prev_clusters, logical_start = le32_to_cpu(vb->vb_xv->xr_clusters);
.vb_bh = xattr_bh,
.vb_xv = xv,
.vb_access = ocfs2_journal_access,
};
u32 prev_clusters, logical_start = le32_to_cpu(vb.vb_xv->xr_clusters);
struct ocfs2_extent_tree et; struct ocfs2_extent_tree et;
mlog(0, "(clusters_to_add for xattr= %u)\n", clusters_to_add); mlog(0, "(clusters_to_add for xattr= %u)\n", clusters_to_add);
ocfs2_init_xattr_value_extent_tree(&et, inode, &vb); ocfs2_init_xattr_value_extent_tree(&et, inode, vb);
status = vb.vb_access(handle, inode, vb.vb_bh, status = vb->vb_access(handle, inode, vb->vb_bh,
OCFS2_JOURNAL_ACCESS_WRITE); OCFS2_JOURNAL_ACCESS_WRITE);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto leave; goto leave;
} }
prev_clusters = le32_to_cpu(vb.vb_xv->xr_clusters); prev_clusters = le32_to_cpu(vb->vb_xv->xr_clusters);
status = ocfs2_add_clusters_in_btree(osb, status = ocfs2_add_clusters_in_btree(osb,
inode, inode,
&logical_start, &logical_start,
@ -616,13 +610,13 @@ static int ocfs2_xattr_extend_allocation(struct inode *inode,
goto leave; goto leave;
} }
status = ocfs2_journal_dirty(handle, vb.vb_bh); status = ocfs2_journal_dirty(handle, vb->vb_bh);
if (status < 0) { if (status < 0) {
mlog_errno(status); mlog_errno(status);
goto leave; goto leave;
} }
clusters_to_add -= le32_to_cpu(vb.vb_xv->xr_clusters) - prev_clusters; clusters_to_add -= le32_to_cpu(vb->vb_xv->xr_clusters) - prev_clusters;
/* /*
* We should have already allocated enough space before the transaction, * We should have already allocated enough space before the transaction,
@ -680,18 +674,12 @@ out:
static int ocfs2_xattr_shrink_size(struct inode *inode, static int ocfs2_xattr_shrink_size(struct inode *inode,
u32 old_clusters, u32 old_clusters,
u32 new_clusters, u32 new_clusters,
struct buffer_head *root_bh, struct ocfs2_xattr_value_buf *vb,
struct ocfs2_xattr_value_root *xv,
struct ocfs2_xattr_set_ctxt *ctxt) struct ocfs2_xattr_set_ctxt *ctxt)
{ {
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 +689,7 @@ static int ocfs2_xattr_shrink_size(struct inode *inode,
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, &alloc_size,
&vb.vb_xv->xr_list); &vb->vb_xv->xr_list);
if (ret) { if (ret) {
mlog_errno(ret); mlog_errno(ret);
goto out; goto out;
@ -710,7 +698,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, &vb, cpos, ret = __ocfs2_remove_xattr_range(inode, vb, cpos,
phys_cpos, alloc_size, phys_cpos, alloc_size,
ctxt); ctxt);
if (ret) { if (ret) {
@ -738,6 +726,11 @@ static int ocfs2_xattr_value_truncate(struct inode *inode,
int ret; int ret;
u32 new_clusters = ocfs2_clusters_for_bytes(inode->i_sb, len); u32 new_clusters = ocfs2_clusters_for_bytes(inode->i_sb, len);
u32 old_clusters = le32_to_cpu(xv->xr_clusters); u32 old_clusters = le32_to_cpu(xv->xr_clusters);
struct ocfs2_xattr_value_buf vb = {
.vb_bh = root_bh,
.vb_xv = xv,
.vb_access = ocfs2_journal_access,
};
if (new_clusters == old_clusters) if (new_clusters == old_clusters)
return 0; return 0;
@ -745,11 +738,11 @@ static int ocfs2_xattr_value_truncate(struct inode *inode,
if (new_clusters > old_clusters) if (new_clusters > old_clusters)
ret = ocfs2_xattr_extend_allocation(inode, ret = ocfs2_xattr_extend_allocation(inode,
new_clusters - old_clusters, new_clusters - old_clusters,
root_bh, xv, ctxt); &vb, ctxt);
else else
ret = ocfs2_xattr_shrink_size(inode, ret = ocfs2_xattr_shrink_size(inode,
old_clusters, new_clusters, old_clusters, new_clusters,
root_bh, xv, ctxt); &vb, ctxt);
return ret; return ret;
} }