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>
This commit is contained in:
parent
960a22ae60
commit
6a897cf447
|
@ -410,7 +410,7 @@ static int call_filldir(struct file * filp, void * dirent,
|
||||||
get_dtype(sb, fname->file_type));
|
get_dtype(sb, fname->file_type));
|
||||||
if (error) {
|
if (error) {
|
||||||
filp->f_pos = curr_pos;
|
filp->f_pos = curr_pos;
|
||||||
info->extra_fname = fname->next;
|
info->extra_fname = fname;
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
fname = fname->next;
|
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
|
* If there are any leftover names on the hash collision
|
||||||
* chain, return them first.
|
* chain, return them first.
|
||||||
*/
|
*/
|
||||||
if (info->extra_fname &&
|
if (info->extra_fname) {
|
||||||
call_filldir(filp, dirent, filldir, info->extra_fname))
|
if (call_filldir(filp, dirent, filldir, info->extra_fname))
|
||||||
goto finished;
|
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);
|
info->curr_node = rb_first(&info->root);
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
|
|
Loading…
Reference in New Issue