domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make all 3.6 patches apply and build

Browse Source 
SVN-Revision: 33911
This commit is contained in:
Florian Fainelli
2012-10-24 13:05:22 +00:00
parent 4eda974038
commit 7e856e5a97
104 changed files with 4209 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/generic/patches-3.6/512-jffs2_eofdetect.patch
View File

@@ -1,13 +1,12 @@
--- a/fs/jffs2/build.c
+++ b/fs/jffs2/build.c
@@ -112,6 +112,17 @@ static int jffs2_build_filesystem(struct
@@ -114,6 +114,16 @@ static int jffs2_build_filesystem(struct
dbg_fsbuild("scanned flash completely\n");
jffs2_dbg_dump_block_lists_nolock(c);
+ 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);
+ mtd_unlock(c->mtd, 0, c->mtd->size);
+ printk("done.\n");
+
+ printk("%s(): erasing all blocks after the end marker... ", __func__);
@@ -20,7 +19,7 @@
/* Now scan the directory tree, increasing nlink according to every dirent found. */
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -147,8 +147,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
@@ -148,8 +148,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
/* reset summary info for next eraseblock scan */
jffs2_sum_reset_collected(s);
@@ -34,7 +33,7 @@
if (ret < 0)
goto out;
@@ -549,6 +552,17 @@ static int jffs2_scan_eraseblock (struct
@@ -556,6 +559,17 @@ static int jffs2_scan_eraseblock (struct
return err;
}