2 files changed, 16 insertions, 24 deletions

diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
index 4c82531ea0a8..5853f4440af4 100644
--- a/fs/ext3/dir.c
+++ b/fs/ext3/dir.c
@@ -456,17 +456,8 @@ static int ext3_dx_readdir(struct file * filp,
         if (info->extra_fname) {
                 if (call_filldir(filp, dirent, filldir, info->extra_fname))
                         goto finished;
-
                 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;
-                }
+                goto next_node;
         } else if (!info->curr_node)
                 info->curr_node = rb_first(&info->root);
 
@@ -498,9 +489,14 @@ static int ext3_dx_readdir(struct file * filp,
                 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 = EXT3_HTREE_EOF;
                                 break;
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index 3ca6a2b7632d..fed5b610df5a 100644
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -459,17 +459,8 @@ static int ext4_dx_readdir(struct file *filp,
         if (info->extra_fname) {
                 if (call_filldir(filp, dirent, filldir, info->extra_fname))
                         goto finished;
-
                 info->extra_fname = NULL;
-                info->curr_node = rb_next(info->curr_node);
-                if (!info->curr_node) {
-                        if (info->next_hash == ~0) {
-                                filp->f_pos = EXT4_HTREE_EOF;
-                                goto finished;
-                        }
-                        info->curr_hash = info->next_hash;
-                        info->curr_minor_hash = 0;
-                }
+                goto next_node;
         } else if (!info->curr_node)
                 info->curr_node = rb_first(&info->root);
 
@@ -501,9 +492,14 @@ static int ext4_dx_readdir(struct file *filp,
                 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;