ocfs2: re-order ocfs2_empty_dir checks
ocfs2_empty_dir() is far more expensive than checking link count. Since both need to be checked at the same time, we can improve performance by checking link count first. Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
Родитель
3a8df2b9c3
Коммит
b80b549c35
|
@ -834,10 +834,7 @@ static int ocfs2_unlink(struct inode *dir,
|
|||
child_locked = 1;
|
||||
|
||||
if (S_ISDIR(inode->i_mode)) {
|
||||
if (!ocfs2_empty_dir(inode)) {
|
||||
status = -ENOTEMPTY;
|
||||
goto leave;
|
||||
} else if (inode->i_nlink != 2) {
|
||||
if (inode->i_nlink != 2 || !ocfs2_empty_dir(inode)) {
|
||||
status = -ENOTEMPTY;
|
||||
goto leave;
|
||||
}
|
||||
|
@ -1280,8 +1277,8 @@ static int ocfs2_rename(struct inode *old_dir,
|
|||
|
||||
if (target_exists) {
|
||||
if (S_ISDIR(new_inode->i_mode)) {
|
||||
if (!ocfs2_empty_dir(new_inode) ||
|
||||
new_inode->i_nlink != 2) {
|
||||
if (new_inode->i_nlink != 2 ||
|
||||
!ocfs2_empty_dir(new_inode)) {
|
||||
status = -ENOTEMPTY;
|
||||
goto bail;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче