Commit b80b549c authored by Mark Fasheh's avatar Mark Fasheh
Browse files

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: default avatarMark Fasheh <mfasheh@suse.com>
parent 3a8df2b9

fs/ocfs2/namei.c

+3 −6
Original line number Diff line number Diff line
@@ -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;

			}