diff options
author | Artem B. Bityuckiy <dedekind@infradead.org> | 2005-02-17 12:51:17 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-05-23 06:39:35 -0400 |
commit | b81226c5d55b16a23f044d37b45e9b6909d8fbce (patch) | |
tree | 41c3f5d6c4d163735a60fc5a930d2feb313c17cd /fs/jffs2/scan.c | |
parent | 171650af9cd847964cf69b6bab9009631283293f (diff) |
[JFFS2] Fix node lookup
Look the ref->next_phys field instead of ->next_in_ino to determine
if the block has more then one node.
Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/jffs2/scan.c')
-rw-r--r-- | fs/jffs2/scan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c index bc6c99980026..b63160f83bab 100644 --- a/fs/jffs2/scan.c +++ b/fs/jffs2/scan.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * | 7 | * |
8 | * For licensing information, see the file 'LICENCE' in this directory. | 8 | * For licensing information, see the file 'LICENCE' in this directory. |
9 | * | 9 | * |
10 | * $Id: scan.c,v 1.118 2005/02/09 09:23:53 pavlov Exp $ | 10 | * $Id: scan.c,v 1.119 2005/02/17 17:51:13 dedekind Exp $ |
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
@@ -433,7 +433,7 @@ scan_more: | |||
433 | /* If we're only checking the beginning of a block with a cleanmarker, | 433 | /* If we're only checking the beginning of a block with a cleanmarker, |
434 | bail now */ | 434 | bail now */ |
435 | if (buf_ofs == jeb->offset && jeb->used_size == PAD(c->cleanmarker_size) && | 435 | if (buf_ofs == jeb->offset && jeb->used_size == PAD(c->cleanmarker_size) && |
436 | c->cleanmarker_size && !jeb->dirty_size && !jeb->first_node->next_in_ino) { | 436 | c->cleanmarker_size && !jeb->dirty_size && !jeb->first_node->next_phys) { |
437 | D1(printk(KERN_DEBUG "%d bytes at start of block seems clean... assuming all clean\n", EMPTY_SCAN_SIZE(c->sector_size))); | 437 | D1(printk(KERN_DEBUG "%d bytes at start of block seems clean... assuming all clean\n", EMPTY_SCAN_SIZE(c->sector_size))); |
438 | return BLK_STATE_CLEANMARKER; | 438 | return BLK_STATE_CLEANMARKER; |
439 | } | 439 | } |
@@ -629,7 +629,7 @@ scan_more: | |||
629 | } | 629 | } |
630 | 630 | ||
631 | if ((jeb->used_size + jeb->unchecked_size) == PAD(c->cleanmarker_size) && !jeb->dirty_size | 631 | if ((jeb->used_size + jeb->unchecked_size) == PAD(c->cleanmarker_size) && !jeb->dirty_size |
632 | && (!jeb->first_node || !jeb->first_node->next_in_ino) ) | 632 | && (!jeb->first_node || !jeb->first_node->next_phys) ) |
633 | return BLK_STATE_CLEANMARKER; | 633 | return BLK_STATE_CLEANMARKER; |
634 | 634 | ||
635 | /* move blocks with max 4 byte dirty space to cleanlist */ | 635 | /* move blocks with max 4 byte dirty space to cleanlist */ |