lkml.org 
[lkml]   [2014]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/13] ext4: rename: move EMLINK check up
    Date
    From: Miklos Szeredi <mszeredi@suse.cz>

    Move checking i_nlink from after ext4_get_first_dir_block() to before. The
    check doesn't rely on the result of that function and the function only
    fails on fs corruption, so the order shouldn't matter.

    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Reviewed-by: Jan Kara <jack@suse.cz>
    ---
    fs/ext4/namei.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
    index 7193cea805ff..87a8a6e613ba 100644
    --- a/fs/ext4/namei.c
    +++ b/fs/ext4/namei.c
    @@ -3084,6 +3084,10 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
    retval = -ENOTEMPTY;
    if (!empty_dir(new.inode))
    goto end_rename;
    + } else {
    + retval = -EMLINK;
    + if (new.dir != old.dir && EXT4_DIR_LINK_MAX(new.dir))
    + goto end_rename;
    }
    retval = -EIO;
    old.dir_bh = ext4_get_first_dir_block(handle, old.inode,
    @@ -3093,10 +3097,6 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
    goto end_rename;
    if (le32_to_cpu(old.parent_de->inode) != old.dir->i_ino)
    goto end_rename;
    - retval = -EMLINK;
    - if (!new.inode && new.dir != old.dir &&
    - EXT4_DIR_LINK_MAX(new.dir))
    - goto end_rename;
    BUFFER_TRACE(old.dir_bh, "get_write_access");
    retval = ext4_journal_get_write_access(handle, old.dir_bh);
    if (retval)
    --
    1.8.1.4


    \
     
     \ /
      Last update: 2014-02-08 02:41    [W:2.977 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site