diff -Narup -x CVS Mtd-orig-20060105/fs/jffs2/scan.c mtd/fs/jffs2/scan.c
--- Mtd-orig-20060105/fs/jffs2/scan.c	2006-01-06 08:13:51.000000000 +0100
+++ mtd/fs/jffs2/scan.c	2006-01-10 14:53:29.000000000 +0100
@@ -454,7 +454,7 @@ scan_more:
 			buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
 			D1(printk(KERN_DEBUG "Fewer than %zd bytes (node header) left to end of buf. Reading 0x%x at 0x%08x\n",
 				  sizeof(struct jffs2_unknown_node), buf_len, ofs));
-			err = jffs2_flash_read_safe(c, buf_ofs, buf_len, buf);
+			err = jffs2_flash_read_safe(c, ofs, buf_len, buf);
 			if (err)
 				return err;
 			buf_ofs = ofs;
@@ -511,7 +511,7 @@ scan_more:
 				break;
 			}
 			D1(printk(KERN_DEBUG "Reading another 0x%x at 0x%08x\n", buf_len, ofs));
-			err = jffs2_flash_read_safe(c, buf_ofs, buf_len, buf);
+			err = jffs2_flash_read_safe(c, ofs, buf_len, buf);
 			if (err)
 				return err;
 			buf_ofs = ofs;
@@ -587,7 +587,7 @@ scan_more:
 				buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
 				D1(printk(KERN_DEBUG "Fewer than %zd bytes (inode node) left to end of buf. Reading 0x%x at 0x%08x\n",
 					  sizeof(struct jffs2_raw_inode), buf_len, ofs));
-				err = jffs2_flash_read_safe(c, buf_ofs, buf_len, buf);
+				err = jffs2_flash_read_safe(c, ofs, buf_len, buf);
 				if (err)
 					return err;
 				buf_ofs = ofs;
@@ -603,7 +603,7 @@ scan_more:
 				buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
 				D1(printk(KERN_DEBUG "Fewer than %d bytes (dirent node) left to end of buf. Reading 0x%x at 0x%08x\n",
 					  je32_to_cpu(node->totlen), buf_len, ofs));
-				err = jffs2_flash_read_safe(c, buf_ofs, buf_len, buf);
+				err = jffs2_flash_read_safe(c, ofs, buf_len, buf);
 				if (err)
 					return err;
 				buf_ofs = ofs;
@@ -650,7 +650,7 @@ scan_more:
 			} else {
 				if (buf_ofs + buf_len < ofs + je32_to_cpu(node->totlen)) {
 					buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
-					err = jffs2_flash_read_safe(c, buf_ofs, buf_len, buf);
+					err = jffs2_flash_read_safe(c, ofs, buf_len, buf);
 					if (err)
 						return err;
 					buf_ofs = ofs;