diff options
| author | Eugene Dashevsky <eugene@ibrix.com> | 2008-10-18 20:27:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 08:52:38 -0700 |
| commit | 6a897cf447a83c9c3fd1b85a1e525c02d6eada7d (patch) | |
| tree | d31c7e566cafce2886bf57079bbb7eea738f8d10 /fs/ext3 | |
| parent | 960a22ae60c8a723bd17da3b929fe0bcea6d007e (diff) | |
| download | linux-6a897cf447a83c9c3fd1b85a1e525c02d6eada7d.tar.gz | |
ext3: fix ext3_dx_readdir hash collision handling
This fixes a bug where readdir() would return a directory entry twice if there was a hash collision in an hash tree indexed directory. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Eugene Dashevsky <eugene@ibrix.com> Signed-off-by: Mike Snitzer <msnitzer@ibrix.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ext3')
| -rw-r--r-- | fs/ext3/dir.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c index 2eea96ec78ed..28b681ef47e8 100644 --- a/fs/ext3/dir.c +++ b/fs/ext3/dir.c @@ -410,7 +410,7 @@ static int call_filldir(struct file * filp, void * dirent, get_dtype(sb, fname->file_type)); if (error) { filp->f_pos = curr_pos; - info->extra_fname = fname->next; + info->extra_fname = fname; return error; } fname = fname->next; @@ -449,11 +449,21 @@ static int ext3_dx_readdir(struct file * filp, * If there are any leftover names on the hash collision * chain, return them first. */ - if (info->extra_fname && - call_filldir(filp, dirent, filldir, info->extra_fname)) - goto finished; + if (info->extra_fname) { + if (call_filldir(filp, dirent, filldir, info->extra_fname)) + goto finished; - if (!info->curr_node) + info->extra_fname = NULL; + info->curr_node = rb_next(info->curr_node); + if (!info->curr_node) { + if (info->next_hash == ~0) { + filp->f_pos = EXT3_HTREE_EOF; + goto finished; + } + info->curr_hash = info->next_hash; + info->curr_minor_hash = 0; + } + } else if (!info->curr_node) info->curr_node = rb_first(&info->root); while (1) { |