diff for duplicates of <20081203195634.GO8950@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 37e76c5..c7d1cfa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -52,3 +52,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> info->curr_minor_hash = fname->minor_hash; if (call_filldir(filp, dirent, filldir, fname)) break; +- ++ next_node: + info->curr_node = rb_next(info->curr_node); +- if (!info->curr_node) { ++ if (info->curr_node) { ++ fname = rb_entry(info->curr_node, struct fname, ++ rb_hash); ++ info->curr_hash = fname->hash; ++ info->curr_minor_hash = fname->minor_hash; ++ } else { + if (info->next_hash == ~0) { + filp->f_pos = EXT4_HTREE_EOF; + break; diff --git a/a/content_digest b/N1/content_digest index 61c71cd..da86ab4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -79,6 +79,19 @@ "@@ -500,9 +491,14 @@ static int ext4_dx_readdir(struct file *\n" " \t\tinfo->curr_minor_hash = fname->minor_hash;\n" " \t\tif (call_filldir(filp, dirent, filldir, fname))\n" - " \t\t\tbreak;" + " \t\t\tbreak;\n" + "-\n" + "+\tnext_node:\n" + " \t\tinfo->curr_node = rb_next(info->curr_node);\n" + "-\t\tif (!info->curr_node) {\n" + "+\t\tif (info->curr_node) {\n" + "+\t\t\tfname = rb_entry(info->curr_node, struct fname,\n" + "+\t\t\t\t\t rb_hash);\n" + "+\t\t\tinfo->curr_hash = fname->hash;\n" + "+\t\t\tinfo->curr_minor_hash = fname->minor_hash;\n" + "+\t\t} else {\n" + " \t\t\tif (info->next_hash == ~0) {\n" + " \t\t\t\tfilp->f_pos = EXT4_HTREE_EOF;\n" + " \t\t\t\tbreak;" -7edf0fec61bced6932c7cf5464d5f89dba39f7987f6f6b411479f34298a9a84a +7ae2d15f53bf0978e95e8fe9d4387119be2415d08199cf643f41ba11c54df07c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.