- landing of b_hd_cleanup_merge to HEAD.

[fs/lustre-release.git] / lustre / kernel_patches / patches / ext3-super-ntohl.patch

diff --git a/lustre/kernel_patches/patches/extN-misc-fixup.patch b/lustre/kernel_patches/patches/ext3-super-ntohl.patch
similarity index 59%
rename from lustre/kernel_patches/patches/extN-misc-fixup.patch
rename to lustre/kernel_patches/patches/ext3-super-ntohl.patch
index 65d9347..3214908 100644 (file)
--- a/lustre/kernel_patches/patches/extN-misc-fixup.patch
+++ b/lustre/kernel_patches/patches/ext3-super-ntohl.patch
@@ -1,9 +1,7 @@
- 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
+diff -rupN linux-2.6.6.old/fs/ext3/super.c linux-2.6.6.new/fs/ext3/super.c
+--- linux-2.6.6.old/fs/ext3/super.c    Mon May 10 05:33:19 2004
++++ linux-2.6.6.new/fs/ext3/super.c    Thu Jun 24 12:28:24 2004
+@@ -1719,10 +1719,10 @@ static journal_t *ext3_get_dev_journal(s
                printk(KERN_ERR "EXT3-fs: I/O error on journal device\n");
                goto out_journal;
        }
@@ -16,5 +14,3 @@
                goto out_journal;
        }
        EXT3_SB(sb)->journal_bdev = bdev;
-
-_