diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
| commit | dcde44e37ed89b02bf98c89c9d20eb7097e21707 (patch) | |
| tree | b152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/512-jffs2_eofdetect.patch | |
| parent | 59d0f03c9af97f38ddb4b99d9a86fa845e1fe170 (diff) | |
| download | upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.gz upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.bz2 upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.zip | |
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/512-jffs2_eofdetect.patch')
| -rw-r--r-- | target/linux/generic/patches-3.6/512-jffs2_eofdetect.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.6/512-jffs2_eofdetect.patch b/target/linux/generic/patches-3.6/512-jffs2_eofdetect.patch index c0afcd281d..f36131e99f 100644 --- a/target/linux/generic/patches-3.6/512-jffs2_eofdetect.patch +++ b/target/linux/generic/patches-3.6/512-jffs2_eofdetect.patch @@ -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; } |