aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-05-30 16:30:51 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-05-30 16:30:51 +0000
commitf664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce (patch)
treeeee31435ae91d4838abf2a566762712522a30f1f /target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
parent83072a149a7d7e6faf7276db7a5f6440d7fa0d24 (diff)
downloadupstream-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.tar.gz
upstream-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.tar.bz2
upstream-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.zip
refresh generic 2.6.25 patches to match upstream style
SVN-Revision: 11296
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch18
1 files changed, 7 insertions, 11 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
index 787ac6d218..5053401f11 100644
--- a/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/fs/jffs2/build.c
-===================================================================
---- linux-2.6.25.4.orig/fs/jffs2/build.c
-+++ linux-2.6.25.4/fs/jffs2/build.c
-@@ -105,6 +105,17 @@ static int jffs2_build_filesystem(struct
+--- a/fs/jffs2/build.c
++++ b/fs/jffs2/build.c
+@@ -105,6 +105,17 @@
dbg_fsbuild("scanned flash completely\n");
jffs2_dbg_dump_block_lists_nolock(c);
@@ -20,11 +18,9 @@ Index: linux-2.6.25.4/fs/jffs2/build.c
dbg_fsbuild("pass 1 starting\n");
c->flags |= JFFS2_SB_FLAG_BUILDING;
/* Now scan the directory tree, increasing nlink according to every dirent found. */
-Index: linux-2.6.25.4/fs/jffs2/scan.c
-===================================================================
---- linux-2.6.25.4.orig/fs/jffs2/scan.c
-+++ linux-2.6.25.4/fs/jffs2/scan.c
-@@ -142,9 +142,12 @@ int jffs2_scan_medium(struct jffs2_sb_in
+--- a/fs/jffs2/scan.c
++++ b/fs/jffs2/scan.c
+@@ -142,9 +142,12 @@
/* reset summary info for next eraseblock scan */
jffs2_sum_reset_collected(s);
@@ -40,7 +36,7 @@ Index: linux-2.6.25.4/fs/jffs2/scan.c
if (ret < 0)
goto out;
-@@ -545,6 +548,17 @@ static int jffs2_scan_eraseblock (struct
+@@ -545,6 +548,17 @@
return err;
}