summaryrefslogtreecommitdiff
path: root/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-12-14 16:41:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-12-14 16:41:33 +0000
commitbff468813f78f81e36ebb2a3f4354de7365e640f (patch)
treee0144a8d723cac2fd84505ec140dd0011541430a /target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
parent7ca328b65927e12b4bb65a6d752f43b674498908 (diff)
downloadmtk-20170518-bff468813f78f81e36ebb2a3f4354de7365e640f.zip
mtk-20170518-bff468813f78f81e36ebb2a3f4354de7365e640f.tar.gz
mtk-20170518-bff468813f78f81e36ebb2a3f4354de7365e640f.tar.bz2
Upgrade to Linux 2.6.19
- Includes large parts of the patch from #1021 by dpalffy - Includes RB532 NAND driver changes by n0-1 SVN-Revision: 5789
Diffstat (limited to 'target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch')
-rw-r--r--target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
index 9f248c9..8037dd0 100644
--- a/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
+++ b/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
@@ -1,6 +1,6 @@
-diff -urN linux.old/fs/jffs2/build.c linux.dev/fs/jffs2/build.c
---- linux.old/fs/jffs2/build.c 2006-06-18 03:49:35.000000000 +0200
-+++ linux.dev/fs/jffs2/build.c 2006-06-23 21:46:48.000000000 +0200
+diff -urN linux-2.6.19.old/fs/jffs2/build.c linux-2.6.19.dev/fs/jffs2/build.c
+--- linux-2.6.19.old/fs/jffs2/build.c 2006-11-29 22:57:37.000000000 +0100
++++ linux-2.6.19.dev/fs/jffs2/build.c 2006-12-14 03:13:57.000000000 +0100
@@ -107,6 +107,17 @@
dbg_fsbuild("scanned flash completely\n");
jffs2_dbg_dump_block_lists_nolock(c);
@@ -19,10 +19,10 @@ diff -urN linux.old/fs/jffs2/build.c linux.dev/fs/jffs2/build.c
dbg_fsbuild("pass 1 starting\n");
c->flags |= JFFS2_SB_FLAG_BUILDING;
/* Now scan the directory tree, increasing nlink according to every dirent found. */
-diff -urN linux.old/fs/jffs2/scan.c linux.dev/fs/jffs2/scan.c
---- linux.old/fs/jffs2/scan.c 2006-06-23 21:39:38.000000000 +0200
-+++ linux.dev/fs/jffs2/scan.c 2006-06-23 21:42:18.000000000 +0200
-@@ -119,9 +119,12 @@
+diff -urN linux-2.6.19.old/fs/jffs2/scan.c linux-2.6.19.dev/fs/jffs2/scan.c
+--- linux-2.6.19.old/fs/jffs2/scan.c 2006-11-29 22:57:37.000000000 +0100
++++ linux-2.6.19.dev/fs/jffs2/scan.c 2006-12-14 03:13:57.000000000 +0100
+@@ -141,9 +141,12 @@
/* reset summary info for next eraseblock scan */
jffs2_sum_reset_collected(s);
@@ -38,7 +38,7 @@ diff -urN linux.old/fs/jffs2/scan.c linux.dev/fs/jffs2/scan.c
if (ret < 0)
goto out;
-@@ -389,6 +392,17 @@
+@@ -540,6 +543,17 @@
return err;
}