lkml.org 
[lkml]   [2008]   [Dec]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 34/35] ocfs2: alloc xattr bucket in ocfs2_xattr_set_handle
    Date
    From: Tiger Yang <tiger.yang@oracle.com>

    In extreme situation, may need xattr bucket for setting
    security entry and acl entries during mknod. This only
    happens when block size is too small.

    Signed-off-by: Tiger Yang <tiger.yang@oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh@suse.com>
    ---
    fs/ocfs2/xattr.c | 18 +++++++++++++++---
    1 files changed, 15 insertions(+), 3 deletions(-)

    diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
    index e5be470..095b0bb 100644
    --- a/fs/ocfs2/xattr.c
    +++ b/fs/ocfs2/xattr.c
    @@ -2611,9 +2611,7 @@ out:
    /*
    * This function only called duing creating inode
    * for init security/acl xattrs of the new inode.
    - * The xattrs could be put into ibody or extent block,
    - * xattr bucket would not be use in this case.
    - * transanction credits also be reserved in here.
    + * All transanction credits have been reserved in mknod.
    */
    int ocfs2_xattr_set_handle(handle_t *handle,
    struct inode *inode,
    @@ -2653,6 +2651,19 @@ int ocfs2_xattr_set_handle(handle_t *handle,
    if (!ocfs2_supports_xattr(OCFS2_SB(inode->i_sb)))
    return -EOPNOTSUPP;

    + /*
    + * In extreme situation, may need xattr bucket when
    + * block size is too small. And we have already reserved
    + * the credits for bucket in mknod.
    + */
    + if (inode->i_sb->s_blocksize == OCFS2_MIN_BLOCKSIZE) {
    + xbs.bucket = ocfs2_xattr_bucket_new(inode);
    + if (!xbs.bucket) {
    + mlog_errno(-ENOMEM);
    + return -ENOMEM;
    + }
    + }
    +
    xis.inode_bh = xbs.inode_bh = di_bh;
    di = (struct ocfs2_dinode *)di_bh->b_data;

    @@ -2672,6 +2683,7 @@ int ocfs2_xattr_set_handle(handle_t *handle,
    cleanup:
    up_write(&OCFS2_I(inode)->ip_xattr_sem);
    brelse(xbs.xattr_bh);
    + ocfs2_xattr_bucket_free(xbs.bucket);

    return ret;
    }
    --
    1.5.6


    \
     
     \ /
      Last update: 2008-12-25 19:19    [W:5.230 / U:0.456 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site