[x86] change default kernel to 2.6.32.8, remove block2mtd patch until it is fixed

[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 ad0ac0c..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,45 @@
-diff -ur linux.old/fs/jffs2/scan.c linux.dev/fs/jffs2/scan.c
---- linux.old/fs/jffs2/scan.c  2003-11-28 19:26:21.000000000 +0100
-+++ linux.dev/fs/jffs2/scan.c  2006-06-22 00:29:02.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.
+  *
++ * Modification for automatically cleaning the filesystem after
++ * a specially marked block
++ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
++ *
+  * $Id: build.c,v 1.16.2.3 2003/04/30 09:43:32 dwmw2 Exp $
+  *
+  */
+@@ -38,6 +42,7 @@
+ #include <linux/kernel.h>
+ #include <linux/jffs2.h>
+ #include <linux/slab.h>
++#include <linux/mtd/mtd.h>
+ #include "nodelist.h"
+ 
+ int jffs2_build_inode_pass1(struct jffs2_sb_info *, struct jffs2_inode_cache *);
+@@ -89,6 +94,18 @@ int jffs2_build_filesystem(struct jffs2_
+       if (ret)
+               return ret;
+ 
++      if (c->flags & (1 << 7)) {
++              printk("%s(): unlocking the mtd device... ", __func__);
++              if (c->mtd->unlock)
++                      c->mtd->unlock(c->mtd, 0, c->mtd->size);
++              printk("done.\n");
++              
++              printk("%s(): erasing all blocks after the end marker... ", __func__);
++              jffs2_erase_pending_blocks(c);
++              jffs2_mark_erased_blocks(c);
++              printk("done.\n");
++      }
++
+       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. */
+--- 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.


@@ -12,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];
  


@@ -26,38 +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;
  

-@@ -145,15 +154,23 @@
-                       c->nr_erasing_blocks++;
-               }
-       }
--      /* Rotate the lists by some number to ensure wear levelling */
--      jffs2_rotate_lists(c);
- 
--      if (c->nr_erasing_blocks) {
--              if (!c->used_size && empty_blocks != c->nr_blocks) {
--                      printk(KERN_NOTICE "Cowardly refusing to erase blocks on filesystem with no valid JFFS2 nodes\n");
--                      return -EIO;
-+      if (c->flags & (1 << 7)) {
-+              printk("jffs2_scan_medium(): erasing all blocks after the end marker...\n");
-+              jffs2_erase_pending_blocks(c);
-+              jffs2_mark_erased_blocks(c);
-+              printk("jffs2_scan_medium(): done.\n");
-+      } else {
-+              /* Rotate the lists by some number to ensure wear levelling */
-+              jffs2_rotate_lists(c);
-+
-+              if (c->nr_erasing_blocks) {
-+                      if (!c->used_size && empty_blocks != c->nr_blocks) {
-+                              printk(KERN_NOTICE "Cowardly refusing to erase blocks on filesystem with no valid JFFS2 nodes\n");
-+                              return -EIO;
-+                      }
-+                      jffs2_erase_pending_trigger(c);
-               }
--              jffs2_erase_pending_trigger(c);
-       }
-       return 0;
- }
-@@ -181,6 +197,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;


@@ -65,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 +219,18 @@
+@@ -202,8 +212,18 @@ static int jffs2_scan_eraseblock (struct

                        break;
                }
  
                        break;
                }
  


@@ -85,4 +93,3 @@ diff -ur linux.old/fs/jffs2/scan.c linux.dev/fs/jffs2/scan.c
                if (err) {
                        D1(printk(KERN_WARNING "mtd->read(0x%x bytes from 0x%x) returned %d\n", sizeof(node), ofs, err));
                        return err;
                if (err) {
                        D1(printk(KERN_WARNING "mtd->read(0x%x bytes from 0x%x) returned %d\n", sizeof(node), ofs, err));
                        return err;

-