diff options
| author | Mark Fasheh <mfasheh@suse.com> | 2009-02-18 22:41:38 +0300 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2009-04-03 22:39:17 +0400 |
| commit | b80b549c3520b31d3bbc4b36e37e0a5102da0b94 (patch) | |
| tree | 403d548a9be6a1e1ae8063a732d520a06defd83c /fs/ocfs2 | |
| parent | 3a8df2b9c365a9f366b76bbbce479e1cc18ddc16 (diff) | |
| download | linux-b80b549c3520b31d3bbc4b36e37e0a5102da0b94.tar.xz | |
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>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/namei.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 67113cfddc9b..58c318d2f061 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c @@ -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; } |