refresh generic 2.6.23 patches in upstream style

SVN-Revision: 11366
This commit is contained in:
Imre Kaloz
2008-06-05 17:01:00 +00:00
parent 04fd31f429
commit 2ff1596a22
63 changed files with 819 additions and 1383 deletions

View File

@@ -1,8 +1,6 @@
Index: linux-2.6.23.17/fs/jffs2/build.c
===================================================================
--- linux-2.6.23.17.orig/fs/jffs2/build.c
+++ linux-2.6.23.17/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.23.17/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.23.17/fs/jffs2/scan.c
===================================================================
--- linux-2.6.23.17.orig/fs/jffs2/scan.c
+++ linux-2.6.23.17/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.23.17/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;
}