use list_for_each() in fs/jffs/intrep.c

patch-kj maximilian attems 3 participants 5 messages Jul 23, 2004 – Jul 29, 2004

Share & tools

maximilian attems

author

2004-07-23 16:07 UTC #0 lore raw

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 <[email protected]>

Signed-off-by Maximilian Attems <[email protected]>

---

 linux-2.6.7-bk20-max/fs/jffs/intrep.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

fs/jffs/intrep.c renamed from fs/jffs/intrep.c~list_for_each-fs-jffs +6 -7

diff -puN fs/jffs/intrep.c~list_for_each-fs-jffs fs/jffs/intrep.c
@@ -1623,7 +1623,7 @@ jffs_find_file(struct jffs_control *c, _
 
 	D3(printk("jffs_find_file(): ino: %u\n", ino));
 
-	for (tmp = c->hash[i].next; tmp != &c->hash[i]; tmp = tmp->next) {
+	list_for_each(tmp, &c->hash[i]) {
 		f = list_entry(tmp, struct jffs_file, hash);
 		if (ino != f->ino)
 			continue;

@@ -2021,11 +2021,10 @@ jffs_foreach_file(struct jffs_control *c
 
 	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;
+
+		/* We must do _safe, because 'func' might remove the
+		   current file 'f' from the list.  */
+		list_for_each_safe(p, next, &c->hash[pos]) {
 			r = func(list_entry(p, struct jffs_file, hash));
 			if (r < 0)
 				return r;

@@ -2590,7 +2589,7 @@ jffs_print_hash_table(struct jffs_contro
 	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) {
+		list_for_each(p, &c->hash[i]) {
 			struct jffs_file *f=list_entry(p,struct jffs_file,hash);
 			printk("*** c->hash[%u]: \"%s\" "
 			       "(ino: %u, pino: %u)\n",

Christoph Hellwig

2004-07-23 16:19 UTC #1 lore raw

Quoted 11 lines · maximilian attems

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 <[email protected]>
Signed-off-by Maximilian Attems <[email protected]>

Please switch to list_for_each_entry while you're at it.

Domen Puncer

2004-07-23 19:10 UTC #2 lore raw

Hi.

Quoted 8 lines · Christoph Hellwig

Quoted 7 lines · maximilian attems
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

Quoted 6 lines

Quoted 4 lines
applies cleanly to 2.6.8-rc2
From: Domen Puncer <[email protected]>
Signed-off-by Maximilian Attems <[email protected]>
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

Signed-off-by Domen Puncer <[email protected]>

fs/jffs/intrep.c +9 ~~-13~~

@@ -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].next, 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 : ""),

Domen Puncer

2004-07-29 11:33 UTC #3 lore raw

Quoted 17 lines · In gmane.linux.kernel Domen Puncer

Hi.
Quoted 13 lines · Christoph Hellwig
Quoted 11 lines · maximilian attems
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 <[email protected]>
Signed-off-by Maximilian Attems <[email protected]>

Quoted 6 lines

Quoted 1 line
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 <[email protected]>

fs/jffs/intrep.c +9 ~~-13~~

@@ -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 : ""),

maximilian attems

author

2004-07-25 12:16 UTC #4 lore raw

In reply to Christoph Hellwig

Quoted 8 lines · Christoph Hellwig

Quoted 7 lines · maximilian attems
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

Quoted 6 lines

Quoted 4 lines
applies cleanly to 2.6.8-rc2
From: Domen Puncer <[email protected]>
Signed-off-by Maximilian Attems <[email protected]>
Please switch to list_for_each_entry while you're at it.

thx will look through the patches that needs that. a++ maks