lkml.org 
[lkml]   [2008]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] UBIFS: fix budgeting request alignment in xattr code
    Date
    From: Zoltan Sogor <weth@inf.u-szeged.hu>

    Data length has to be aligned in the budgeting request. Code
    in xattr.c did not do this.

    Signed-off-by: Zoltan Sogor <weth@inf.u-szeged.hu>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
    ---
    fs/ubifs/xattr.c | 10 +++++-----
    1 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
    index 39e831d..6f493de 100644
    --- a/fs/ubifs/xattr.c
    +++ b/fs/ubifs/xattr.c
    @@ -103,8 +103,8 @@ static int create_xattr(struct ubifs_info *c, struct inode *host,
    struct inode *inode;
    struct ubifs_inode *ui, *host_ui = ubifs_inode(host);
    struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1,
    - .new_ino_d = size, .dirtied_ino = 1,
    - .dirtied_ino_d = ALIGN(host_ui->data_len, 8)};
    + .new_ino_d = ALIGN(size, 8), .dirtied_ino = 1,
    + .dirtied_ino_d = ALIGN(host_ui->data_len, 8) };

    if (host_ui->xattr_cnt >= MAX_XATTRS_PER_INODE)
    return -ENOSPC;
    @@ -200,7 +200,7 @@ static int change_xattr(struct ubifs_info *c, struct inode *host,
    struct ubifs_inode *host_ui = ubifs_inode(host);
    struct ubifs_inode *ui = ubifs_inode(inode);
    struct ubifs_budget_req req = { .dirtied_ino = 2,
    - .dirtied_ino_d = size + host_ui->data_len };
    + .dirtied_ino_d = ALIGN(size, 8) + ALIGN(host_ui->data_len, 8) };

    ubifs_assert(ui->data_len == inode->i_size);
    err = ubifs_budget_space(c, &req);
    @@ -497,8 +497,8 @@ static int remove_xattr(struct ubifs_info *c, struct inode *host,
    int err;
    struct ubifs_inode *host_ui = ubifs_inode(host);
    struct ubifs_inode *ui = ubifs_inode(inode);
    - struct ubifs_budget_req req = { .dirtied_ino = 1, .mod_dent = 1,
    - .dirtied_ino_d = host_ui->data_len };
    + struct ubifs_budget_req req = { .dirtied_ino = 2, .mod_dent = 1,
    + .dirtied_ino_d = ALIGN(host_ui->data_len, 8) };

    ubifs_assert(ui->data_len == inode->i_size);

    --
    1.5.4.1


    \
     
     \ /
      Last update: 2008-08-13 10:43    [W:0.026 / U:29.628 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site