Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 125884
b: refs/heads/master
c: b3e5d37
h: refs/heads/master
v: v3
  • Loading branch information
Joel Becker authored and Mark Fasheh committed Jan 5, 2009
1 parent 7e76180 commit 3fafbe4
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 33 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 19b801f45fa5e4840b9be3dcf1e73b08f35b04d9
refs/heads/master: b3e5d37905730dc5ddff717f55ed830caa80ea0e
66 changes: 34 additions & 32 deletions trunk/fs/ocfs2/xattr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -718,31 +718,25 @@ static int ocfs2_xattr_shrink_size(struct inode *inode,
}

static int ocfs2_xattr_value_truncate(struct inode *inode,
struct buffer_head *root_bh,
struct ocfs2_xattr_value_root *xv,
struct ocfs2_xattr_value_buf *vb,
int len,
struct ocfs2_xattr_set_ctxt *ctxt)
{
int ret;
u32 new_clusters = ocfs2_clusters_for_bytes(inode->i_sb, len);
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,
};
u32 old_clusters = le32_to_cpu(vb->vb_xv->xr_clusters);

if (new_clusters == old_clusters)
return 0;

if (new_clusters > old_clusters)
ret = ocfs2_xattr_extend_allocation(inode,
new_clusters - old_clusters,
&vb, ctxt);
vb, ctxt);
else
ret = ocfs2_xattr_shrink_size(inode,
old_clusters, new_clusters,
&vb, ctxt);
vb, ctxt);

return ret;
}
Expand Down Expand Up @@ -1330,6 +1324,10 @@ static int ocfs2_xattr_set_value_outside(struct inode *inode,
struct ocfs2_xattr_value_root *xv = NULL;
size_t size = OCFS2_XATTR_SIZE(name_len) + OCFS2_XATTR_ROOT_SIZE;
int ret = 0;
struct ocfs2_xattr_value_buf vb = {
.vb_bh = xs->xattr_bh,
.vb_access = ocfs2_journal_access
};

memset(val, 0, size);
memcpy(val, xi->name, name_len);
Expand All @@ -1340,9 +1338,9 @@ static int ocfs2_xattr_set_value_outside(struct inode *inode,
xv->xr_list.l_tree_depth = 0;
xv->xr_list.l_count = cpu_to_le16(1);
xv->xr_list.l_next_free_rec = 0;
vb.vb_xv = xv;

ret = ocfs2_xattr_value_truncate(inode, xs->xattr_bh, xv,
xi->value_len, ctxt);
ret = ocfs2_xattr_value_truncate(inode, &vb, xi->value_len, ctxt);
if (ret < 0) {
mlog_errno(ret);
return ret;
Expand All @@ -1352,7 +1350,7 @@ static int ocfs2_xattr_set_value_outside(struct inode *inode,
mlog_errno(ret);
return ret;
}
ret = __ocfs2_xattr_set_value_outside(inode, ctxt->handle, xv,
ret = __ocfs2_xattr_set_value_outside(inode, ctxt->handle, vb.vb_xv,
xi->value, xi->value_len);
if (ret < 0)
mlog_errno(ret);
Expand Down Expand Up @@ -1550,9 +1548,12 @@ static int ocfs2_xattr_set_entry(struct inode *inode,
goto out;
} else if (!ocfs2_xattr_is_local(xs->here)) {
/* For existing xattr which has value outside */
struct ocfs2_xattr_value_root *xv = NULL;
xv = (struct ocfs2_xattr_value_root *)(val +
OCFS2_XATTR_SIZE(name_len));
struct ocfs2_xattr_value_buf vb = {
.vb_bh = xs->xattr_bh,
.vb_xv = (struct ocfs2_xattr_value_root *)
(val + OCFS2_XATTR_SIZE(name_len)),
.vb_access = ocfs2_journal_access,
};

if (xi->value_len > OCFS2_XATTR_INLINE_SIZE) {
/*
Expand All @@ -1561,8 +1562,7 @@ static int ocfs2_xattr_set_entry(struct inode *inode,
* then set new value with set_value_outside().
*/
ret = ocfs2_xattr_value_truncate(inode,
xs->xattr_bh,
xv,
&vb,
xi->value_len,
ctxt);
if (ret < 0) {
Expand All @@ -1582,7 +1582,7 @@ static int ocfs2_xattr_set_entry(struct inode *inode,

ret = __ocfs2_xattr_set_value_outside(inode,
handle,
xv,
vb.vb_xv,
xi->value,
xi->value_len);
if (ret < 0)
Expand All @@ -1594,8 +1594,7 @@ static int ocfs2_xattr_set_entry(struct inode *inode,
* just trucate old value to zero.
*/
ret = ocfs2_xattr_value_truncate(inode,
xs->xattr_bh,
xv,
&vb,
0,
ctxt);
if (ret < 0)
Expand Down Expand Up @@ -1714,15 +1713,17 @@ static int ocfs2_remove_value_outside(struct inode*inode,
struct ocfs2_xattr_entry *entry = &header->xh_entries[i];

if (!ocfs2_xattr_is_local(entry)) {
struct ocfs2_xattr_value_root *xv;
struct ocfs2_xattr_value_buf vb = {
.vb_bh = bh,
.vb_access = ocfs2_journal_access,
};
void *val;

val = (void *)header +
le16_to_cpu(entry->xe_name_offset);
xv = (struct ocfs2_xattr_value_root *)
vb.vb_xv = (struct ocfs2_xattr_value_root *)
(val + OCFS2_XATTR_SIZE(entry->xe_name_len));
ret = ocfs2_xattr_value_truncate(inode, bh, xv,
0, &ctxt);
ret = ocfs2_xattr_value_truncate(inode, &vb, 0, &ctxt);
if (ret < 0) {
mlog_errno(ret);
break;
Expand Down Expand Up @@ -4651,11 +4652,12 @@ static int ocfs2_xattr_bucket_value_truncate(struct inode *inode,
{
int ret, offset;
u64 value_blk;
struct buffer_head *value_bh = NULL;
struct ocfs2_xattr_value_root *xv;
struct ocfs2_xattr_entry *xe;
struct ocfs2_xattr_header *xh = bucket_xh(bucket);
size_t blocksize = inode->i_sb->s_blocksize;
struct ocfs2_xattr_value_buf vb = {
.vb_access = ocfs2_journal_access,
};

xe = &xh->xh_entries[xe_off];

Expand All @@ -4669,11 +4671,11 @@ static int ocfs2_xattr_bucket_value_truncate(struct inode *inode,
/* We don't allow ocfs2_xattr_value to be stored in different block. */
BUG_ON(value_blk != (offset + OCFS2_XATTR_ROOT_SIZE - 1) / blocksize);

value_bh = bucket->bu_bhs[value_blk];
BUG_ON(!value_bh);
vb.vb_bh = bucket->bu_bhs[value_blk];
BUG_ON(!vb.vb_bh);

xv = (struct ocfs2_xattr_value_root *)
(value_bh->b_data + offset % blocksize);
vb.vb_xv = (struct ocfs2_xattr_value_root *)
(vb.vb_bh->b_data + offset % blocksize);

ret = ocfs2_xattr_bucket_journal_access(ctxt->handle, bucket,
OCFS2_JOURNAL_ACCESS_WRITE);
Expand All @@ -4691,7 +4693,7 @@ static int ocfs2_xattr_bucket_value_truncate(struct inode *inode,
*/
mlog(0, "truncate %u in xattr bucket %llu to %d bytes.\n",
xe_off, (unsigned long long)bucket_blkno(bucket), len);
ret = ocfs2_xattr_value_truncate(inode, value_bh, xv, len, ctxt);
ret = ocfs2_xattr_value_truncate(inode, &vb, len, ctxt);
if (ret) {
mlog_errno(ret);
goto out_dirty;
Expand Down

0 comments on commit 3fafbe4

Please sign in to comment.