[cavium-octeon] update to 2.6.30-rc5

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

diff --git a/target/linux/generic-2.6/patches-2.6.27/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.27/204-jffs2_eofdetect.patch
index 17a082d..16d3e1f 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.27/204-jffs2_eofdetect.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/204-jffs2_eofdetect.patch
@@ -1,6 +1,6 @@
 --- a/fs/jffs2/build.c
 +++ b/fs/jffs2/build.c
 --- a/fs/jffs2/build.c
 +++ b/fs/jffs2/build.c

-@@ -111,6 +111,17 @@
+@@ -111,6 +111,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,7 +20,7 @@
        /* Now scan the directory tree, increasing nlink according to every dirent found. */
 --- a/fs/jffs2/scan.c
 +++ b/fs/jffs2/scan.c
        /* Now scan the directory tree, increasing nlink according to every dirent found. */
 --- a/fs/jffs2/scan.c
 +++ b/fs/jffs2/scan.c

-@@ -72,7 +72,7 @@
+@@ -72,7 +72,7 @@ static int file_dirty(struct jffs2_sb_in

                return ret;
        if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
                return ret;
                return ret;
        if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
                return ret;


@@ -29,7 +29,7 @@
           think it's recoverable now. */
        jeb->dirty_size += jeb->wasted_size;
        c->dirty_size += jeb->wasted_size;
           think it's recoverable now. */
        jeb->dirty_size += jeb->wasted_size;
        c->dirty_size += jeb->wasted_size;

-@@ -144,8 +144,11 @@
+@@ -144,8 +144,11 @@ 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);
  


@@ -43,7 +43,7 @@
  
                if (ret < 0)
                        goto out;
  
                if (ret < 0)
                        goto out;

-@@ -400,7 +403,7 @@
+@@ -400,7 +403,7 @@ static int jffs2_scan_xref_node(struct j

        if (!ref)
                return -ENOMEM;
  
        if (!ref)
                return -ENOMEM;
  


@@ -52,7 +52,7 @@
         * and AFTER xattr_ref is marked as a dead xref,
         * ref->xid is used to store 32bit xid, xd is not used
         * ref->ino is used to store 32bit inode-number, ic is not used
         * and AFTER xattr_ref is marked as a dead xref,
         * ref->xid is used to store 32bit xid, xd is not used
         * ref->ino is used to store 32bit inode-number, ic is not used

-@@ -473,7 +476,7 @@
+@@ -473,7 +476,7 @@ static int jffs2_scan_eraseblock (struct

                struct jffs2_sum_marker *sm;
                void *sumptr = NULL;
                uint32_t sumlen;
                struct jffs2_sum_marker *sm;
                void *sumptr = NULL;
                uint32_t sumlen;


@@ -61,7 +61,7 @@
                if (!buf_size) {
                        /* XIP case. Just look, point at the summary if it's there */
                        sm = (void *)buf + c->sector_size - sizeof(*sm);
                if (!buf_size) {
                        /* XIP case. Just look, point at the summary if it's there */
                        sm = (void *)buf + c->sector_size - sizeof(*sm);

-@@ -489,9 +492,9 @@
+@@ -489,9 +492,9 @@ static int jffs2_scan_eraseblock (struct

                                buf_len = sizeof(*sm);
  
                        /* Read as much as we want into the _end_ of the preallocated buffer */
                                buf_len = sizeof(*sm);
  
                        /* Read as much as we want into the _end_ of the preallocated buffer */


@@ -73,7 +73,7 @@
                        if (err)
                                return err;
  
                        if (err)
                                return err;
  

-@@ -510,9 +513,9 @@
+@@ -510,9 +513,9 @@ static int jffs2_scan_eraseblock (struct

                                }
                                if (buf_len < sumlen) {
                                        /* Need to read more so that the entire summary node is present */
                                }
                                if (buf_len < sumlen) {
                                        /* Need to read more so that the entire summary node is present */


@@ -85,7 +85,7 @@
                                        if (err)
                                                return err;
                                }
                                        if (err)
                                                return err;
                                }

-@@ -525,7 +528,7 @@
+@@ -525,7 +528,7 @@ static int jffs2_scan_eraseblock (struct

  
                        if (buf_size && sumlen > buf_size)
                                kfree(sumptr);
  
                        if (buf_size && sumlen > buf_size)
                                kfree(sumptr);


@@ -94,7 +94,7 @@
                           If it returns positive, that's a block classification
                           (i.e. BLK_STATE_xxx) so return that too.
                           If it returns zero, fall through to full scan. */
                           If it returns positive, that's a block classification
                           (i.e. BLK_STATE_xxx) so return that too.
                           If it returns zero, fall through to full scan. */

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

                        return err;
        }
  
                        return err;
        }
  


@@ -112,7 +112,7 @@
        /* We temporarily use 'ofs' as a pointer into the buffer/jeb */
        ofs = 0;
  
        /* We temporarily use 'ofs' as a pointer into the buffer/jeb */
        ofs = 0;
  

-@@ -671,7 +685,7 @@
+@@ -671,7 +685,7 @@ scan_more:

                                scan_end = buf_len;
                                goto more_empty;
                        }
                                scan_end = buf_len;
                                goto more_empty;
                        }


@@ -121,7 +121,7 @@
                        /* See how much more there is to read in this eraseblock... */
                        buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
                        if (!buf_len) {
                        /* See how much more there is to read in this eraseblock... */
                        buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
                        if (!buf_len) {

-@@ -907,7 +921,7 @@
+@@ -907,7 +921,7 @@ scan_more:

  
        D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
                  jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));
  
        D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
                  jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));