[ar71xx] create firmware image for the RouterStation Pro, and add a profile for it...

[openwrt.git] / target / linux / generic-2.4 / patches / 227-jffs2_eofdetect.patch

diff --git a/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch b/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch
index fe97be5..196693d 100644 (file)
--- a/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch
+++ b/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch
@@ -1,6 +1,5 @@
-diff -ur linux.old/fs/jffs2/build.c linux.dev/fs/jffs2/build.c
---- linux.old/fs/jffs2/build.c 2003-06-13 16:51:37.000000000 +0200
-+++ linux.dev/fs/jffs2/build.c 2006-06-23 22:15:21.000000000 +0200
+--- a/fs/jffs2/build.c
++++ b/fs/jffs2/build.c

 @@ -31,6 +31,10 @@
   * provisions above, a recipient may use your version of this file
   * under either the RHEPL or the GPL.
 @@ -31,6 +31,10 @@
   * provisions above, a recipient may use your version of this file
   * under either the RHEPL or the GPL.


@@ -20,7 +19,7 @@ diff -ur linux.old/fs/jffs2/build.c linux.dev/fs/jffs2/build.c
  #include "nodelist.h"
  
  int jffs2_build_inode_pass1(struct jffs2_sb_info *, struct jffs2_inode_cache *);
  #include "nodelist.h"
  
  int jffs2_build_inode_pass1(struct jffs2_sb_info *, struct jffs2_inode_cache *);

-@@ -89,6 +94,18 @@
+@@ -89,6 +94,18 @@ int jffs2_build_filesystem(struct jffs2_

        if (ret)
                return ret;
  
        if (ret)
                return ret;
  


@@ -39,9 +38,8 @@ diff -ur linux.old/fs/jffs2/build.c linux.dev/fs/jffs2/build.c
        D1(printk(KERN_DEBUG "Scanned flash completely\n"));
        /* Now build the data map for each inode, marking obsoleted nodes
           as such, and also increase nlink of any children. */
        D1(printk(KERN_DEBUG "Scanned flash completely\n"));
        /* Now build the data map for each inode, marking obsoleted nodes
           as such, and also increase nlink of any children. */

-diff -ur linux.old/fs/jffs2/scan.c linux.dev/fs/jffs2/scan.c
---- linux.old/fs/jffs2/scan.c  2006-06-23 21:57:32.000000000 +0200
-+++ linux.dev/fs/jffs2/scan.c  2006-06-23 22:01:35.000000000 +0200
+--- a/fs/jffs2/scan.c
++++ b/fs/jffs2/scan.c

 @@ -31,6 +31,10 @@
   * provisions above, a recipient may use your version of this file
   * under either the RHEPL or the GPL.
 @@ -31,6 +31,10 @@
   * provisions above, a recipient may use your version of this file
   * under either the RHEPL or the GPL.


@@ -53,7 +51,7 @@ diff -ur linux.old/fs/jffs2/scan.c linux.dev/fs/jffs2/scan.c
   * $Id: scan.c,v 1.51.2.4 2003/11/02 13:51:18 dwmw2 Exp $
   *
   */
   * $Id: scan.c,v 1.51.2.4 2003/11/02 13:51:18 dwmw2 Exp $
   *
   */

-@@ -88,7 +92,12 @@
+@@ -88,7 +92,12 @@ int jffs2_scan_medium(struct jffs2_sb_in

        for (i=0; i<c->nr_blocks; i++) {
                struct jffs2_eraseblock *jeb = &c->blocks[i];
  
        for (i=0; i<c->nr_blocks; i++) {
                struct jffs2_eraseblock *jeb = &c->blocks[i];
  


@@ -67,7 +65,7 @@ diff -ur linux.old/fs/jffs2/scan.c linux.dev/fs/jffs2/scan.c
                if (ret < 0)
                        return ret;
  
                if (ret < 0)
                        return ret;
  

-@@ -181,6 +190,7 @@
+@@ -181,6 +190,7 @@ static int jffs2_scan_eraseblock (struct

  
        while(ofs < jeb->offset + c->sector_size) {
                ssize_t retlen;
  
        while(ofs < jeb->offset + c->sector_size) {
                ssize_t retlen;


@@ -75,7 +73,7 @@ diff -ur linux.old/fs/jffs2/scan.c linux.dev/fs/jffs2/scan.c
                ACCT_PARANOIA_CHECK(jeb);
                
                if (ofs & 3) {
                ACCT_PARANOIA_CHECK(jeb);
                
                if (ofs & 3) {

-@@ -202,8 +212,18 @@
+@@ -202,8 +212,18 @@ static int jffs2_scan_eraseblock (struct

                        break;
                }
  
                        break;
                }