Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ext4: rename: move EMLINK check up

Browse source 
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>
This commit is contained in:
Miklos Szeredi 2014-04-01 17:08:44 +02:00
parent c0d268c366
commit 0d7d5d678b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/ext4/namei.c
View file

@ -3084,6 +3084,10 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
retval = -ENOTEMPTY; retval = -ENOTEMPTY;
if (!empty_dir(new.inode)) if (!empty_dir(new.inode))
goto end_rename; goto end_rename;
} else {
retval = -EMLINK;
if (new.dir != old.dir && EXT4_DIR_LINK_MAX(new.dir))
goto end_rename;
} }
retval = -EIO; retval = -EIO;
old.dir_bh = ext4_get_first_dir_block(handle, old.inode, 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; goto end_rename;
if (le32_to_cpu(old.parent_de->inode) != old.dir->i_ino) if (le32_to_cpu(old.parent_de->inode) != old.dir->i_ino)
goto end_rename; 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"); BUFFER_TRACE(old.dir_bh, "get_write_access");
retval = ext4_journal_get_write_access(handle, old.dir_bh); retval = ext4_journal_get_write_access(handle, old.dir_bh);
if (retval) if (retval)