[kernel] refresh generic 2.6.21 patches

[openwrt.git] / target / linux / generic-2.6 / patches / 204-jffs2_eofdetect.patch

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..5c301b4 100644 (file)
--- a/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
+++ b/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
@@ -1,7 +1,8 @@
-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
-@@ -107,6 +107,17 @@
+Index: linux-2.6.21.7/fs/jffs2/build.c
+===================================================================
+--- linux-2.6.21.7.orig/fs/jffs2/build.c
++++ linux-2.6.21.7/fs/jffs2/build.c
+@@ -107,6 +107,17 @@ static int jffs2_build_filesystem(struct

        dbg_fsbuild("scanned flash completely\n");
        jffs2_dbg_dump_block_lists_nolock(c);
  
        dbg_fsbuild("scanned flash completely\n");
        jffs2_dbg_dump_block_lists_nolock(c);
  


@@ -19,10 +20,11 @@ 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. */
        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 @@
+Index: linux-2.6.21.7/fs/jffs2/scan.c
+===================================================================
+--- linux-2.6.21.7.orig/fs/jffs2/scan.c
++++ linux-2.6.21.7/fs/jffs2/scan.c
+@@ -143,9 +143,12 @@ int jffs2_scan_medium(struct jffs2_sb_in

  
                /* reset summary info for next eraseblock scan */
                jffs2_sum_reset_collected(s);
  
                /* reset summary info for next eraseblock scan */
                jffs2_sum_reset_collected(s);


@@ -38,7 +40,7 @@ diff -urN linux.old/fs/jffs2/scan.c linux.dev/fs/jffs2/scan.c
  
                if (ret < 0)
                        goto out;
  
                if (ret < 0)
                        goto out;

-@@ -389,6 +392,17 @@
+@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct

                        return err;
        }
  
                        return err;
        }