1 files changed, 9 insertions, 13 deletions

diff --git a/fs/jffs/intrep.c b/fs/jffs/intrep.c
index 456d7e6e29c2..27f199e94cfc 100644
--- a/fs/jffs/intrep.c
+++ b/fs/jffs/intrep.c
@@ -1701,12 +1701,10 @@ jffs_find_file(struct jffs_control *c, __u32 ino)
 {
         struct jffs_file *f;
         int i = ino % c->hash_len;
-        struct list_head *tmp;
 
         D3(printk("jffs_find_file(): ino: %u\n", ino));
 
-        for (tmp = c->hash[i].next; tmp != &c->hash[i]; tmp = tmp->next) {
-                f = list_entry(tmp, struct jffs_file, hash);
+        list_for_each_entry(f, &c->hash[i], hash) {
                 if (ino != f->ino)
                         continue;
                 D3(printk("jffs_find_file(): Found file with ino "
@@ -2102,13 +2100,12 @@ jffs_foreach_file(struct jffs_control *c, int (*func)(struct jffs_file *))
         int result = 0;
 
         for (pos = 0; pos < c->hash_len; pos++) {
-                struct list_head *p, *next;
-                for (p = c->hash[pos].next; p != &c->hash[pos]; p = next) {
-                        /* We need a reference to the next file in the
-                           list because `func' might remove the current
-                           file `f'.  */
-                        next = p->next;
-                        r = func(list_entry(p, struct jffs_file, hash));
+                struct jffs_file *f, *next;
+
+                /* We must do _safe, because 'func' might remove the
+                   current file 'f' from the list.  */
+                list_for_each_entry_safe(f, next, &c->hash[pos], hash) {
+                        r = func(f);
                         if (r < 0)
                                 return r;
                         result += r;
@@ -2613,9 +2610,8 @@ jffs_print_hash_table(struct jffs_control *c)
 
         printk("JFFS: Dumping the file system's hash table...\n");
         for (i = 0; i < c->hash_len; i++) {
-                struct list_head *p;
-                for (p = c->hash[i].next; p != &c->hash[i]; p = p->next) {
-                        struct jffs_file *f=list_entry(p,struct jffs_file,hash);
+                struct jffs_file *f;
+                list_for_each_entry(f, &c->hash[i], hash) {
                         printk("*** c->hash[%u]: \"%s\" "
                                "(ino: %u, pino: %u)\n",
                                i, (f->name ? f->name : ""),