From e2e6a5bb07fd248abf4c35181394395524395295 Mon Sep 17 00:00:00 2001 From: hauke Date: Sat, 17 Jul 2010 14:10:39 +0000 Subject: kernel: refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22252 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../generic/patches-2.6.35/204-jffs2_eofdetect.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'target/linux/generic/patches-2.6.35/204-jffs2_eofdetect.patch') diff --git a/target/linux/generic/patches-2.6.35/204-jffs2_eofdetect.patch b/target/linux/generic/patches-2.6.35/204-jffs2_eofdetect.patch index 16d3e1f8e..c2bb20883 100644 --- a/target/linux/generic/patches-2.6.35/204-jffs2_eofdetect.patch +++ b/target/linux/generic/patches-2.6.35/204-jffs2_eofdetect.patch @@ -43,7 +43,7 @@ if (ret < 0) goto out; -@@ -400,7 +403,7 @@ static int jffs2_scan_xref_node(struct j +@@ -402,7 +405,7 @@ static int jffs2_scan_xref_node(struct j 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 -@@ -473,7 +476,7 @@ static int jffs2_scan_eraseblock (struct +@@ -475,7 +478,7 @@ static int jffs2_scan_eraseblock (struct 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); -@@ -489,9 +492,9 @@ static int jffs2_scan_eraseblock (struct +@@ -491,9 +494,9 @@ static int jffs2_scan_eraseblock (struct 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; -@@ -510,9 +513,9 @@ static int jffs2_scan_eraseblock (struct +@@ -512,9 +515,9 @@ static int jffs2_scan_eraseblock (struct } if (buf_len < sumlen) { /* Need to read more so that the entire summary node is present */ @@ -85,7 +85,7 @@ if (err) return err; } -@@ -525,7 +528,7 @@ static int jffs2_scan_eraseblock (struct +@@ -527,7 +530,7 @@ static int jffs2_scan_eraseblock (struct 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. */ -@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct +@@ -548,6 +551,17 @@ static int jffs2_scan_eraseblock (struct return err; } @@ -112,7 +112,7 @@ /* We temporarily use 'ofs' as a pointer into the buffer/jeb */ ofs = 0; -@@ -671,7 +685,7 @@ scan_more: +@@ -673,7 +687,7 @@ scan_more: 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) { -@@ -907,7 +921,7 @@ scan_more: +@@ -909,7 +923,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)); -- cgit v1.2.3