Branch b1_6

b=13397
i=johann
i=shadow

Split the export journal-api part as a separate patch.

diff --git a/ldiskfs/kernel_patches/patches/ext3-export-journal-api.patch b/ldiskfs/kernel_patches/patches/ext3-export-journal-api.patch
new file mode 100644 (file)
index 0000000..7511213
--- /dev/null
+++ b/ldiskfs/kernel_patches/patches/ext3-export-journal-api.patch
@@ -0,0 +1,24 @@
+--- linux-src.org/fs/ext3/ext3_jbd.c
++++ linux-src/fs/ext3/ext3_jbd.c
+@@ -2,6 +2,7 @@
+  * Interface between ext3 and JBD
+  */
+ 
++#include <linux/module.h>
+ #include <linux/ext3_jbd.h>
+ 
+ int __ext3_journal_get_undo_access(const char *where, handle_t *handle,
+@@ -21,6 +21,7 @@ int __ext3_journal_get_write_access(cons
+               ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
+       return err;
+ }
++EXPORT_SYMBOL(__ext3_journal_get_write_access);
+ 
+ int __ext3_journal_forget(const char *where, handle_t *handle,
+                               struct buffer_head *bh)
+@@ -57,3 +58,5 @@ int __ext3_journal_dirty_metadata(const 
+               ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
+       return err;
+ }
++
++EXPORT_SYMBOL(__ext3_journal_dirty_metadata);

diff --git a/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.22-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.22-vanilla.patch
index 101d983..8554589 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.22-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.22-vanilla.patch
@@ -338,27 +338,3 @@ Index: linux-2.6.18/fs/ext3/fiemap.h
 +#define       FIEMAP_EXTENT_EOF       0x00000100 /* if fm_start+fm_len is beyond EOF*/
 +
 +#endif /* _LINUX_EXT3_FIEMAP_H */
 +#define       FIEMAP_EXTENT_EOF       0x00000100 /* if fm_start+fm_len is beyond EOF*/
 +
 +#endif /* _LINUX_EXT3_FIEMAP_H */

---- linux-src.org/fs/ext3/ext3_jbd.c
-+++ linux-src/fs/ext3/ext3_jbd.c
-@@ -2,6 +2,7 @@
-  * Interface between ext3 and JBD
-  */
- 
-+#include <linux/module.h>
- #include <linux/ext3_jbd.h>
- 
- int __ext3_journal_get_undo_access(const char *where, handle_t *handle,
-@@ -21,6 +21,7 @@ int __ext3_journal_get_write_access(cons
-               ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-       return err;
- }
-+EXPORT_SYMBOL(__ext3_journal_get_write_access);
- 
- int __ext3_journal_forget(const char *where, handle_t *handle,
-                               struct buffer_head *bh)
-@@ -57,3 +58,5 @@ int __ext3_journal_dirty_metadata(const 
-               ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-       return err;
- }
-+
-+EXPORT_SYMBOL(__ext3_journal_dirty_metadata);

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series
index fb575b5..5bf60dc 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series
@@ -18,3 +18,4 @@ ext3-fiemap-2.6.22-vanilla.patch
 ext3-statfs-2.6.22.patch
 ext3-lookup-dotdot-2.6.9.patch
 ext3-unlink-race.patch
 ext3-statfs-2.6.22.patch
 ext3-lookup-dotdot-2.6.9.patch
 ext3-unlink-race.patch

+ext3-export-journal-api.patch