From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S264358AbUG2Ld6 (ORCPT ); Thu, 29 Jul 2004 07:33:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S264371AbUG2Ld6 (ORCPT ); Thu, 29 Jul 2004 07:33:58 -0400 Received: from main.gmane.org ([80.91.224.249]:30136 "EHLO main.gmane.org") by vger.kernel.org with ESMTP id S264358AbUG2Ldy (ORCPT ); Thu, 29 Jul 2004 07:33:54 -0400 X-Injected-Via-Gmane: http://gmane.org/ To: linux-kernel@vger.kernel.org From: Domen Puncer Subject: Re: [patch-kj] use list_for_each() in fs/jffs/intrep.c Date: Thu, 29 Jul 2004 11:33:50 +0000 (UTC) Message-ID: References: <20040723155528.GQ1795@stro.at> <20040723161724.GA31884@infradead.org> X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: coderock.org User-Agent: tin/1.6.2-20030910 ("Pabbay") (UNIX) (Linux/2.6.8-rc2 (i686)) Cc: jffs-dev@axis.com Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org In gmane.linux.kernel Domen Puncer wrote: > Hi. > > On Fri, 23 Jul 2004 17:17:24 +0100, Christoph Hellwig wrote: > >> On Fri, Jul 23, 2004 at 05:55:28PM +0200, maximilian attems wrote: >>> >>> Use list_for_each() where applicable >>> - for (list = ymf_devs.next; list != &ymf_devs; list = list->next) { >>> + list_for_each(list, &ymf_devs) { >>> pure cosmetic change, defined as a preprocessor macro in: >>> include/linux/list.h >>> >>> applies cleanly to 2.6.8-rc2 >>> >>> From: Domen Puncer >>> Signed-off-by: Maximilian Attems >> >> Please switch to list_for_each_entry while you're at it. > > Jup, list_for_each_entry is nicer. > (first time posting trough gmane, hope it works) > > Compile tested But wrong (sorry), here is the fixed patch: (This, along with some other list_for_each_entry patches will also be posted to kernel-janitor ml) Use list_for_each_entry to make code more readable. Compile tested. Signed-off-by: Domen Puncer --- c/fs/jffs/intrep.c Wed Jul 14 19:15:11 2004 +++ list_for_each/fs/jffs/intrep.c Wed Jul 28 20:34:06 2004 @@ -1619,12 +1619,10 @@ { 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 " @@ -2020,13 +2018,12 @@ 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; @@ -2589,9 +2586,8 @@ 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 : ""),