From 259586302e96ea8475c38da04eb466a79e70547c Mon Sep 17 00:00:00 2001 From: yangsheng Date: Mon, 21 Jan 2008 06:31:36 +0000 Subject: [PATCH] Branch HEAD b=14349 i=johann i=alex Add journal_dev option to ldiskfs module. --- ldiskfs/kernel_patches/patches/ext3-dynlocks-common.patch | 2 +- ldiskfs/kernel_patches/patches/ext3-external-journal-2.6.9.patch | 2 +- ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ldiskfs/kernel_patches/patches/ext3-dynlocks-common.patch b/ldiskfs/kernel_patches/patches/ext3-dynlocks-common.patch index 9709e42..b69d7a3 100644 --- a/ldiskfs/kernel_patches/patches/ext3-dynlocks-common.patch +++ b/ldiskfs/kernel_patches/patches/ext3-dynlocks-common.patch @@ -42,7 +42,7 @@ Index: linux-stage/include/linux/dynlocks.h + Index: linux-stage/fs/ext3/dynlocks.c =================================================================== ---- linux-stage.orig/lib/dynlocks.c 2006-06-16 16:07:58.000000000 +0300 +--- linux-stage.orig/fs/ext3/dynlocks.c 2006-06-16 16:07:58.000000000 +0300 +++ linux-stage/fs/ext3/dynlocks.c 2007-08-30 05:45:51.000000000 +0300 @@ -0,0 +1,232 @@ +/* diff --git a/ldiskfs/kernel_patches/patches/ext3-external-journal-2.6.9.patch b/ldiskfs/kernel_patches/patches/ext3-external-journal-2.6.9.patch index 7cc86f2..2b3e3fd 100644 --- a/ldiskfs/kernel_patches/patches/ext3-external-journal-2.6.9.patch +++ b/ldiskfs/kernel_patches/patches/ext3-external-journal-2.6.9.patch @@ -32,9 +32,9 @@ Index: linux-2.6.9-full/fs/ext3/super.c {Opt_data_journal, "data=journal"}, {Opt_data_ordered, "data=ordered"}, @@ -675,8 +677,9 @@ static unsigned long get_sb_block(void * - return sb_block; } + int user_selected_hash_function = -1; -static int parse_options (char * options, struct super_block *sb, - unsigned long * inum, unsigned long *n_blocks_count, int is_remount) +static int parse_options (char *options, struct super_block *sb, diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series index 85ee0a0..3cc7dd9 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series @@ -25,3 +25,4 @@ ext3-dynlocks-2.6-rhel4.patch ext3-iam-common.patch ext3-iam-2.6.9-rhel4.patch ext3-orphans-delay.patch +ext3-external-journal-2.6.9.patch -- 1.8.3.1