From ba6e227b9e23a284e8562b2e9d76194342ba652e Mon Sep 17 00:00:00 2001 From: "Artem B. Bityuckiy" Date: Thu, 17 Feb 2005 17:51:17 +0000 Subject: [PATCH] --- yaml --- r: 4490 b: refs/heads/master c: b81226c5d55b16a23f044d37b45e9b6909d8fbce h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jffs2/scan.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e1fd2142bad5..ce3b15c2af48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 171650af9cd847964cf69b6bab9009631283293f +refs/heads/master: b81226c5d55b16a23f044d37b45e9b6909d8fbce diff --git a/trunk/fs/jffs2/scan.c b/trunk/fs/jffs2/scan.c index bc6c99980026..b63160f83bab 100644 --- a/trunk/fs/jffs2/scan.c +++ b/trunk/fs/jffs2/scan.c @@ -7,7 +7,7 @@ * * For licensing information, see the file 'LICENCE' in this directory. * - * $Id: scan.c,v 1.118 2005/02/09 09:23:53 pavlov Exp $ + * $Id: scan.c,v 1.119 2005/02/17 17:51:13 dedekind Exp $ * */ #include @@ -433,7 +433,7 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo /* If we're only checking the beginning of a block with a cleanmarker, bail now */ if (buf_ofs == jeb->offset && jeb->used_size == PAD(c->cleanmarker_size) && - c->cleanmarker_size && !jeb->dirty_size && !jeb->first_node->next_in_ino) { + c->cleanmarker_size && !jeb->dirty_size && !jeb->first_node->next_phys) { D1(printk(KERN_DEBUG "%d bytes at start of block seems clean... assuming all clean\n", EMPTY_SCAN_SIZE(c->sector_size))); return BLK_STATE_CLEANMARKER; } @@ -629,7 +629,7 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo } if ((jeb->used_size + jeb->unchecked_size) == PAD(c->cleanmarker_size) && !jeb->dirty_size - && (!jeb->first_node || !jeb->first_node->next_in_ino) ) + && (!jeb->first_node || !jeb->first_node->next_phys) ) return BLK_STATE_CLEANMARKER; /* move blocks with max 4 byte dirty space to cleanlist */