lkml.org 
[lkml]   [2004]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
SubjectRe: [patch-kj] use list_for_each() in fs/jffs/intrep.c
Date
In gmane.linux.kernel Domen Puncer <domen@coderock.org> 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 <domen@coderock.org>
>>> Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
>>
>> 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 <domen@coderock.org>

--- 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 : ""),
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:04    [from the cache]
©2003-2011 Jasper Spaans