Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 216d81bb authored by Domen Puncer's avatar Domen Puncer Committed by Linus Torvalds
Browse files

[PATCH] janitor: jffs/intrep: list_for_each_entry 



Use list_for_each_entry to make code more readable.

Signed-off-by: default avatarMaximilian Attems <janitor@sternwelten.at>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
Cc: <jffs-dev@axis.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 81616c5a

fs/jffs/intrep.c

+9 −13
Original line number Original line Diff line number Diff line
@@ -1701,12 +1701,10 @@ jffs_find_file(struct jffs_control *c, __u32 ino) 
{

{

	struct jffs_file *f;

	struct jffs_file *f;

	int i = ino % c->hash_len;

	int i = ino % c->hash_len;

	struct list_head *tmp;





	D3(printk("jffs_find_file(): ino: %u\n", ino));

	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_entry(f, &c->hash[i], hash) {

		f = list_entry(tmp, struct jffs_file, hash);

		if (ino != f->ino)

		if (ino != f->ino)

			continue;

			continue;

		D3(printk("jffs_find_file(): Found file with ino "

		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;

	int result = 0;





	for (pos = 0; pos < c->hash_len; pos++) {

	for (pos = 0; pos < c->hash_len; pos++) {

		struct list_head *p, *next;

		struct jffs_file *f, *next;

		for (p = c->hash[pos].next; p != &c->hash[pos]; p = next) {



			/* We need a reference to the next file in the

		/* We must do _safe, because 'func' might remove the

			   list because `func' might remove the current

		   current file 'f' from the list.  */

			   file `f'.  */

		list_for_each_entry_safe(f, next, &c->hash[pos], hash) {

			next = p->next;

			r = func(f);

			r = func(list_entry(p, struct jffs_file, hash));

			if (r < 0)

			if (r < 0)

				return r;

				return r;

			result += 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");

	printk("JFFS: Dumping the file system's hash table...\n");

	for (i = 0; i < c->hash_len; i++) {

	for (i = 0; i < c->hash_len; i++) {

		struct list_head *p;

		struct jffs_file *f;

		for (p = c->hash[i].next; p != &c->hash[i]; p = p->next) {

		list_for_each_entry(f, &c->hash[i], hash) {

			struct jffs_file *f=list_entry(p,struct jffs_file,hash);

			printk("*** c->hash[%u]: \"%s\" "

			printk("*** c->hash[%u]: \"%s\" "

			       "(ino: %u, pino: %u)\n",

			       "(ino: %u, pino: %u)\n",

			       i, (f->name ? f->name : ""),

			       i, (f->name ? f->name : ""),