Skip to content

Commit

Permalink
ocfs2: Set xattr block entries with ocfs2_xa_set()
Browse files Browse the repository at this point in the history 
ocfs2_xattr_block_set() calls into ocfs2_xattr_set_entry() with just the
HAS_XATTR flag.  Most of the machinery of ocfs2_xattr_set_entry() is
skipped.  All that really happens other than the call to ocfs2_xa_set()
is making sure the HAS_XATTR flag is set on the inode.

But HAS_XATTR should be set when we also set di->i_xattr_loc.  And
that's done in ocfs2_create_xattr_block().  So let's move it there, and
then ocfs2_xattr_block_set() can just call ocfs2_xa_set().

While we're there, ocfs2_create_xattr_block() can take the set_ctxt for
a smaller argument list.  It also learns to set HAS_XATTR_FL, because it
knows for sure.  ocfs2_create_empty_xatttr_block() in the reflink path
fakes a set_ctxt to call ocfs2_create_xattr_block().

Signed-off-by: Joel Becker <joel.becker@oracle.com>
  • Loading branch information
Joel Becker committed Feb 26, 2010
1 parent c5d95df commit d398154
Showing 1 changed file with 49 additions and 50 deletions.
99 changes: 49 additions & 50 deletions fs/ocfs2/xattr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2206,10 +2206,8 @@ static int ocfs2_xattr_set_entry(struct inode *inode,
int ret;
struct ocfs2_xa_loc loc;

if (!(flag & OCFS2_INLINE_XATTR_FL))
BUG_ON(xs->xattr_bh == xs->inode_bh);
else
BUG_ON(xs->xattr_bh != xs->inode_bh);
BUG_ON(!(flag & OCFS2_INLINE_XATTR_FL));
BUG_ON(xs->xattr_bh != xs->inode_bh);

ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), xs->inode_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
Expand All @@ -2218,13 +2216,8 @@ static int ocfs2_xattr_set_entry(struct inode *inode,
goto out;
}

if (xs->xattr_bh == xs->inode_bh)
ocfs2_init_dinode_xa_loc(&loc, inode, xs->inode_bh,
xs->not_found ? NULL : xs->here);
else
ocfs2_init_xattr_block_xa_loc(&loc, inode, xs->xattr_bh,
xs->not_found ? NULL : xs->here);

ocfs2_init_dinode_xa_loc(&loc, inode, xs->inode_bh,
xs->not_found ? NULL : xs->here);
ret = ocfs2_xa_set(&loc, xi, ctxt);
if (ret) {
if (ret != -ENOSPC)
Expand All @@ -2233,8 +2226,7 @@ static int ocfs2_xattr_set_entry(struct inode *inode,
}
xs->here = loc.xl_entry;

if (!(oi->ip_dyn_features & OCFS2_INLINE_XATTR_FL) &&
(flag & OCFS2_INLINE_XATTR_FL)) {
if (!(oi->ip_dyn_features & OCFS2_INLINE_XATTR_FL)) {
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
unsigned int xattrsize = osb->s_xattr_inline_size;

Expand All @@ -2254,7 +2246,7 @@ static int ocfs2_xattr_set_entry(struct inode *inode,
}
/* Update xattr flag */
spin_lock(&oi->ip_lock);
oi->ip_dyn_features |= flag;
oi->ip_dyn_features |= OCFS2_INLINE_XATTR_FL;
di->i_dyn_features = cpu_to_le16(oi->ip_dyn_features);
spin_unlock(&oi->ip_lock);

Expand Down Expand Up @@ -2748,12 +2740,11 @@ static int ocfs2_xattr_block_find(struct inode *inode,
return ret;
}

static int ocfs2_create_xattr_block(handle_t *handle,
struct inode *inode,
static int ocfs2_create_xattr_block(struct inode *inode,
struct buffer_head *inode_bh,
struct ocfs2_alloc_context *meta_ac,
struct buffer_head **ret_bh,
int indexed)
struct ocfs2_xattr_set_ctxt *ctxt,
int indexed,
struct buffer_head **ret_bh)
{
int ret;
u16 suballoc_bit_start;
Expand All @@ -2764,14 +2755,14 @@ static int ocfs2_create_xattr_block(handle_t *handle,
struct buffer_head *new_bh = NULL;
struct ocfs2_xattr_block *xblk;

ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), inode_bh,
OCFS2_JOURNAL_ACCESS_CREATE);
ret = ocfs2_journal_access_di(ctxt->handle, INODE_CACHE(inode),
inode_bh, OCFS2_JOURNAL_ACCESS_CREATE);
if (ret < 0) {
mlog_errno(ret);
goto end;
}

ret = ocfs2_claim_metadata(osb, handle, meta_ac, 1,
ret = ocfs2_claim_metadata(osb, ctxt->handle, ctxt->meta_ac, 1,
&suballoc_bit_start, &num_got,
&first_blkno);
if (ret < 0) {
Expand All @@ -2782,7 +2773,7 @@ static int ocfs2_create_xattr_block(handle_t *handle,
new_bh = sb_getblk(inode->i_sb, first_blkno);
ocfs2_set_new_buffer_uptodate(INODE_CACHE(inode), new_bh);

ret = ocfs2_journal_access_xb(handle, INODE_CACHE(inode),
ret = ocfs2_journal_access_xb(ctxt->handle, INODE_CACHE(inode),
new_bh,
OCFS2_JOURNAL_ACCESS_CREATE);
if (ret < 0) {
Expand All @@ -2794,11 +2785,10 @@ static int ocfs2_create_xattr_block(handle_t *handle,
xblk = (struct ocfs2_xattr_block *)new_bh->b_data;
memset(xblk, 0, inode->i_sb->s_blocksize);
strcpy((void *)xblk, OCFS2_XATTR_BLOCK_SIGNATURE);
xblk->xb_suballoc_slot = cpu_to_le16(meta_ac->ac_alloc_slot);
xblk->xb_suballoc_slot = cpu_to_le16(ctxt->meta_ac->ac_alloc_slot);
xblk->xb_suballoc_bit = cpu_to_le16(suballoc_bit_start);
xblk->xb_fs_generation = cpu_to_le32(osb->fs_generation);
xblk->xb_blkno = cpu_to_le64(first_blkno);

if (indexed) {
struct ocfs2_xattr_tree_root *xr = &xblk->xb_attrs.xb_root;
xr->xt_clusters = cpu_to_le32(1);
Expand All @@ -2809,14 +2799,17 @@ static int ocfs2_create_xattr_block(handle_t *handle,
xr->xt_list.l_next_free_rec = cpu_to_le16(1);
xblk->xb_flags = cpu_to_le16(OCFS2_XATTR_INDEXED);
}
ocfs2_journal_dirty(ctxt->handle, new_bh);

ret = ocfs2_journal_dirty(handle, new_bh);
if (ret < 0) {
mlog_errno(ret);
goto end;
}
/* Add it to the inode */
di->i_xattr_loc = cpu_to_le64(first_blkno);
ocfs2_journal_dirty(handle, inode_bh);

spin_lock(&OCFS2_I(inode)->ip_lock);
OCFS2_I(inode)->ip_dyn_features |= OCFS2_HAS_XATTR_FL;
di->i_dyn_features = cpu_to_le16(OCFS2_I(inode)->ip_dyn_features);
spin_unlock(&OCFS2_I(inode)->ip_lock);

ocfs2_journal_dirty(ctxt->handle, inode_bh);

*ret_bh = new_bh;
new_bh = NULL;
Expand All @@ -2838,13 +2831,13 @@ static int ocfs2_xattr_block_set(struct inode *inode,
struct ocfs2_xattr_set_ctxt *ctxt)
{
struct buffer_head *new_bh = NULL;
handle_t *handle = ctxt->handle;
struct ocfs2_xattr_block *xblk = NULL;
int ret;
struct ocfs2_xa_loc loc;

if (!xs->xattr_bh) {
ret = ocfs2_create_xattr_block(handle, inode, xs->inode_bh,
ctxt->meta_ac, &new_bh, 0);
ret = ocfs2_create_xattr_block(inode, xs->inode_bh, ctxt,
0, &new_bh);
if (ret) {
mlog_errno(ret);
goto end;
Expand All @@ -2860,21 +2853,25 @@ static int ocfs2_xattr_block_set(struct inode *inode,
xblk = (struct ocfs2_xattr_block *)xs->xattr_bh->b_data;

if (!(le16_to_cpu(xblk->xb_flags) & OCFS2_XATTR_INDEXED)) {
/* Set extended attribute into external block */
ret = ocfs2_xattr_set_entry(inode, xi, xs, ctxt,
OCFS2_HAS_XATTR_FL);
if (!ret || ret != -ENOSPC)
goto end;
ocfs2_init_xattr_block_xa_loc(&loc, inode, xs->xattr_bh,
xs->not_found ? NULL : xs->here);

ret = ocfs2_xattr_create_index_block(inode, xs, ctxt);
if (ret)
ret = ocfs2_xa_set(&loc, xi, ctxt);
if (!ret)
xs->here = loc.xl_entry;
else if (ret != -ENOSPC)
goto end;
else {
ret = ocfs2_xattr_create_index_block(inode, xs, ctxt);
if (ret)
goto end;
}
}

ret = ocfs2_xattr_set_entry_index_block(inode, xi, xs, ctxt);
if (le16_to_cpu(xblk->xb_flags) & OCFS2_XATTR_INDEXED)
ret = ocfs2_xattr_set_entry_index_block(inode, xi, xs, ctxt);

end:

return ret;
}

Expand Down Expand Up @@ -6434,31 +6431,33 @@ static int ocfs2_create_empty_xattr_block(struct inode *inode,
int indexed)
{
int ret;
handle_t *handle;
struct ocfs2_alloc_context *meta_ac;
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_xattr_set_ctxt ctxt = {
.meta_ac = meta_ac,
};

ret = ocfs2_reserve_new_metadata_blocks(osb, 1, &meta_ac);
if (ret < 0) {
mlog_errno(ret);
return ret;
}

handle = ocfs2_start_trans(osb, OCFS2_XATTR_BLOCK_CREATE_CREDITS);
if (IS_ERR(handle)) {
ret = PTR_ERR(handle);
ctxt.handle = ocfs2_start_trans(osb, OCFS2_XATTR_BLOCK_CREATE_CREDITS);
if (IS_ERR(ctxt.handle)) {
ret = PTR_ERR(ctxt.handle);
mlog_errno(ret);
goto out;
}

mlog(0, "create new xattr block for inode %llu, index = %d\n",
(unsigned long long)fe_bh->b_blocknr, indexed);
ret = ocfs2_create_xattr_block(handle, inode, fe_bh,
meta_ac, ret_bh, indexed);
ret = ocfs2_create_xattr_block(inode, fe_bh, &ctxt, indexed,
ret_bh);
if (ret)
mlog_errno(ret);

ocfs2_commit_trans(osb, handle);
ocfs2_commit_trans(osb, ctxt.handle);
out:
ocfs2_free_alloc_context(meta_ac);
return ret;
Expand Down

0 comments on commit d398154

Please sign in to comment.