[cavium-octeon] update to 2.6.30-rc5

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

diff --git a/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
index f1ffac6..eccdbe2 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.23-rc6/fs/jffs2/build.c
-===================================================================
---- linux-2.6.23-rc6.orig/fs/jffs2/build.c     2007-09-21 16:23:53.000000000 +0800
-+++ linux-2.6.23-rc6/fs/jffs2/build.c  2007-09-21 16:24:05.000000000 +0800
-@@ -105,6 +105,17 @@
+--- a/fs/jffs2/build.c
++++ b/fs/jffs2/build.c
+@@ -105,6 +105,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);
  


@@ -20,11 +18,9 @@ Index: linux-2.6.23-rc6/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. */

-Index: linux-2.6.23-rc6/fs/jffs2/scan.c
-===================================================================
---- linux-2.6.23-rc6.orig/fs/jffs2/scan.c      2007-09-21 16:23:52.000000000 +0800
-+++ linux-2.6.23-rc6/fs/jffs2/scan.c   2007-09-21 16:24:05.000000000 +0800
-@@ -142,9 +142,12 @@
+--- a/fs/jffs2/scan.c
++++ b/fs/jffs2/scan.c
+@@ -142,9 +142,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);


@@ -40,7 +36,7 @@ Index: linux-2.6.23-rc6/fs/jffs2/scan.c
  
                if (ret < 0)
                        goto out;
  
                if (ret < 0)
                        goto out;

-@@ -545,6 +548,17 @@
+@@ -545,6 +548,17 @@ static int jffs2_scan_eraseblock (struct

                        return err;
        }
  
                        return err;
        }