Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 125778
b: refs/heads/master
c: 1224be0
h: refs/heads/master
v: v3
  • Loading branch information
Joel Becker authored and Mark Fasheh committed Jan 5, 2009
1 parent 90315a4 commit be36aca
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 77 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: 784b816a9198dc3782c97cde8ddcf52fecdf1797
refs/heads/master: 1224be020f62ada3e19822feeac3840abf80de3e
140 changes: 64 additions & 76 deletions trunk/fs/ocfs2/xattr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,37 @@ static int ocfs2_read_xattr_bucket(struct inode *inode,
return rc;
}

static int ocfs2_xattr_bucket_journal_access(handle_t *handle,
struct inode *inode,
struct ocfs2_xattr_bucket *bucket,
int type)
{
int i, rc = 0;
int blks = ocfs2_blocks_per_xattr_bucket(inode->i_sb);

for (i = 0; i < blks; i++) {
rc = ocfs2_journal_access(handle, inode,
bucket->bu_bhs[i], type);
if (rc) {
mlog_errno(rc);
break;
}
}

return rc;
}

static void ocfs2_xattr_bucket_journal_dirty(handle_t *handle,
struct inode *inode,
struct ocfs2_xattr_bucket *bucket)
{
int i, blks = ocfs2_blocks_per_xattr_bucket(inode->i_sb);

for (i = 0; i < blks; i++)
ocfs2_journal_dirty(handle, bucket->bu_bhs[i]);
}


static inline const char *ocfs2_xattr_prefix(int name_index)
{
struct xattr_handler *handler = NULL;
Expand Down Expand Up @@ -3218,8 +3249,8 @@ static int ocfs2_divide_xattr_bucket(struct inode *inode,
goto out;
}

ret = ocfs2_journal_access(handle, inode, s_bucket.bu_bhs[0],
OCFS2_JOURNAL_ACCESS_WRITE);
ret = ocfs2_xattr_bucket_journal_access(handle, inode, &s_bucket,
OCFS2_JOURNAL_ACCESS_WRITE);
if (ret) {
mlog_errno(ret);
goto out;
Expand All @@ -3235,15 +3266,13 @@ static int ocfs2_divide_xattr_bucket(struct inode *inode,
goto out;
}

for (i = 0; i < blk_per_bucket; i++) {
ret = ocfs2_journal_access(handle, inode, t_bucket.bu_bhs[i],
new_bucket_head ?
OCFS2_JOURNAL_ACCESS_CREATE :
OCFS2_JOURNAL_ACCESS_WRITE);
if (ret) {
mlog_errno(ret);
goto out;
}
ret = ocfs2_xattr_bucket_journal_access(handle, inode, &t_bucket,
new_bucket_head ?
OCFS2_JOURNAL_ACCESS_CREATE :
OCFS2_JOURNAL_ACCESS_WRITE);
if (ret) {
mlog_errno(ret);
goto out;
}

xh = bucket_xh(&s_bucket);
Expand Down Expand Up @@ -3339,11 +3368,7 @@ static int ocfs2_divide_xattr_bucket(struct inode *inode,
else
xh->xh_num_buckets = 0;

for (i = 0; i < blk_per_bucket; i++) {
ocfs2_journal_dirty(handle, t_bucket.bu_bhs[i]);
if (ret)
mlog_errno(ret);
}
ocfs2_xattr_bucket_journal_dirty(handle, inode, &t_bucket);

/* store the first_hash of the new bucket. */
if (first_hash)
Expand All @@ -3364,9 +3389,7 @@ static int ocfs2_divide_xattr_bucket(struct inode *inode,
xh->xh_free_start = cpu_to_le16(name_offset);
xh->xh_name_value_len = cpu_to_le16(name_value_len);

ocfs2_journal_dirty(handle, s_bucket.bu_bhs[0]);
if (ret)
mlog_errno(ret);
ocfs2_xattr_bucket_journal_dirty(handle, inode, &s_bucket);

out:
ocfs2_xattr_bucket_relse(inode, &s_bucket);
Expand Down Expand Up @@ -3413,20 +3436,18 @@ static int ocfs2_cp_xattr_bucket(struct inode *inode,
if (ret)
goto out;

for (i = 0; i < blk_per_bucket; i++) {
ret = ocfs2_journal_access(handle, inode, t_bucket.bu_bhs[i],
t_is_new ?
OCFS2_JOURNAL_ACCESS_CREATE :
OCFS2_JOURNAL_ACCESS_WRITE);
if (ret)
goto out;
}
ret = ocfs2_xattr_bucket_journal_access(handle, inode, &t_bucket,
t_is_new ?
OCFS2_JOURNAL_ACCESS_CREATE :
OCFS2_JOURNAL_ACCESS_WRITE);
if (ret)
goto out;

for (i = 0; i < blk_per_bucket; i++) {
memcpy(bucket_block(&t_bucket, i), bucket_block(&s_bucket, i),
blocksize);
ocfs2_journal_dirty(handle, t_bucket.bu_bhs[i]);
}
ocfs2_xattr_bucket_journal_dirty(handle, inode, &t_bucket);

out:
ocfs2_xattr_bucket_relse(inode, &s_bucket);
Expand Down Expand Up @@ -3799,9 +3820,9 @@ static int ocfs2_extend_xattr_bucket(struct inode *inode,

/*
* We will touch all the buckets after the start_bh(include it).
* Add one more bucket and modify the first_bh.
* Then we add one more bucket.
*/
credits = end_blk - start_blk + 2 * blk_per_bucket + 1;
credits = end_blk - start_blk + 3 * blk_per_bucket + 1;
handle = ocfs2_start_trans(osb, credits);
if (IS_ERR(handle)) {
ret = PTR_ERR(handle);
Expand Down Expand Up @@ -4077,33 +4098,6 @@ static void ocfs2_xattr_set_entry_normal(struct inode *inode,
return;
}

static int ocfs2_xattr_bucket_handle_journal(struct inode *inode,
handle_t *handle,
struct ocfs2_xattr_search *xs,
struct buffer_head **bhs,
u16 bh_num)
{
int ret = 0, off, block_off;
struct ocfs2_xattr_entry *xe = xs->here;

/*
* First calculate all the blocks we should journal_access
* and journal_dirty. The first block should always be touched.
*/
ret = ocfs2_journal_dirty(handle, bhs[0]);
if (ret)
mlog_errno(ret);

/* calc the data. */
off = le16_to_cpu(xe->xe_name_offset);
block_off = off >> inode->i_sb->s_blocksize_bits;
ret = ocfs2_journal_dirty(handle, bhs[block_off]);
if (ret)
mlog_errno(ret);

return ret;
}

/*
* Set the xattr entry in the specified bucket.
* The bucket is indicated by xs->bucket and it should have the enough
Expand All @@ -4115,7 +4109,7 @@ static int ocfs2_xattr_set_entry_in_bucket(struct inode *inode,
u32 name_hash,
int local)
{
int i, ret;
int ret;
handle_t *handle = NULL;
u16 blk_per_bucket = ocfs2_blocks_per_xattr_bucket(inode->i_sb);
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
Expand Down Expand Up @@ -4143,22 +4137,16 @@ static int ocfs2_xattr_set_entry_in_bucket(struct inode *inode,
goto out;
}

for (i = 0; i < blk_per_bucket; i++) {
ret = ocfs2_journal_access(handle, inode, xs->bucket.bu_bhs[i],
OCFS2_JOURNAL_ACCESS_WRITE);
if (ret < 0) {
mlog_errno(ret);
goto out;
}
ret = ocfs2_xattr_bucket_journal_access(handle, inode, &xs->bucket,
OCFS2_JOURNAL_ACCESS_WRITE);
if (ret < 0) {
mlog_errno(ret);
goto out;
}

ocfs2_xattr_set_entry_normal(inode, xi, xs, name_hash, local);
ocfs2_xattr_bucket_journal_dirty(handle, inode, &xs->bucket);

/*Only dirty the blocks we have touched in set xattr. */
ret = ocfs2_xattr_bucket_handle_journal(inode, handle, xs,
xs->bucket.bu_bhs, blk_per_bucket);
if (ret)
mlog_errno(ret);
out:
ocfs2_commit_trans(osb, handle);

Expand Down Expand Up @@ -4398,15 +4386,16 @@ static void ocfs2_xattr_bucket_remove_xs(struct inode *inode,
le16_to_cpu(xh->xh_count) - 1];
int ret = 0;

handle = ocfs2_start_trans((OCFS2_SB(inode->i_sb)), 1);
handle = ocfs2_start_trans((OCFS2_SB(inode->i_sb)),
ocfs2_blocks_per_xattr_bucket(inode->i_sb));
if (IS_ERR(handle)) {
ret = PTR_ERR(handle);
mlog_errno(ret);
return;
}

ret = ocfs2_journal_access(handle, inode, xs->bucket.bu_bhs[0],
OCFS2_JOURNAL_ACCESS_WRITE);
ret = ocfs2_xattr_bucket_journal_access(handle, inode, &xs->bucket,
OCFS2_JOURNAL_ACCESS_WRITE);
if (ret) {
mlog_errno(ret);
goto out_commit;
Expand All @@ -4418,9 +4407,8 @@ static void ocfs2_xattr_bucket_remove_xs(struct inode *inode,
memset(last, 0, sizeof(struct ocfs2_xattr_entry));
le16_add_cpu(&xh->xh_count, -1);

ret = ocfs2_journal_dirty(handle, xs->bucket.bu_bhs[0]);
if (ret < 0)
mlog_errno(ret);
ocfs2_xattr_bucket_journal_dirty(handle, inode, &xs->bucket);

out_commit:
ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
}
Expand Down

0 comments on commit be36aca

Please sign in to comment.