merge b_devel into HEAD, which will become 0.7.3

[fs/lustre-release.git] / lustre / kernel_patches / patches / extN-misc-fixup.patch

diff --git a/lustre/kernel_patches/patches/extN-misc-fixup.patch b/lustre/kernel_patches/patches/extN-misc-fixup.patch
index 06ea72a..65d9347 100644 (file)
--- a/lustre/kernel_patches/patches/extN-misc-fixup.patch
+++ b/lustre/kernel_patches/patches/extN-misc-fixup.patch
@@ -1,6 +1,9 @@
---- linux-2.4.17/fs/ext3/super.c.orig  Fri Dec 21 10:41:55 2001
-+++ linux-2.4.17/fs/ext3/super.c       Fri Mar 22 11:00:41 2002
-@@ -1344,10 +1342,10 @@
+ fs/ext3/super.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+--- linux-2.4.18-p4smp/fs/ext3/super.c~extN-misc-fixup 2003-07-21 23:07:50.000000000 -0600
++++ linux-2.4.18-p4smp-braam/fs/ext3/super.c   2003-07-21 23:08:06.000000000 -0600
+@@ -1578,10 +1578,10 @@ static journal_t *ext3_get_dev_journal(s
                printk(KERN_ERR "EXT3-fs: I/O error on journal device\n");
                goto out_journal;
        }
@@ -13,11 +16,5 @@
                goto out_journal;
        }
        EXT3_SB(sb)->journal_bdev = bdev;
-@@ -1560,6 +1560,7 @@
-       unlock_kernel();
-       return ret;
- }
-+EXPORT_SYMBOL(ext3_force_commit); /* here to avoid potential patch collisions */
- 
- /*
-  * Ext3 always journals updates to the superblock itself, so we don't
+
+_