diff --git a/lustre/kernel_patches/patches/ext3-disable-write-barrier-by-default-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-disable-write-bar-by-default-2.6-sles10.patch similarity index 100% rename from lustre/kernel_patches/patches/ext3-disable-write-barrier-by-default-2.6-sles10.patch rename to ldiskfs/kernel_patches/patches/ext3-disable-write-bar-by-default-2.6-sles10.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series index a20d75ab9e600c19c4284fb1848851007f7023d4..11f62b04fb3f91d7386ad965445ea0b6978a4037 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series @@ -10,5 +10,5 @@ ext3-nlinks-2.6.9.patch ext3-ialloc-2.6.patch ext3-remove-cond_resched-calls-2.6.12.patch ext3-filterdata-2.6.15.patch -ext3-disable-write-barrier-by-default-2.6-sles10.patch +ext3-disable-write-bar-by-default-2.6-sles10.patch ext3-nanosecond-2.6-sles10.patch diff --git a/lustre/kernel_patches/patches/ext3-disable-write-bar-by-default-2.6-sles10.patch b/lustre/kernel_patches/patches/ext3-disable-write-bar-by-default-2.6-sles10.patch new file mode 100644 index 0000000000000000000000000000000000000000..9b8d33152ebbed9a23dbd66e6ec32a221bbdeb72 --- /dev/null +++ b/lustre/kernel_patches/patches/ext3-disable-write-bar-by-default-2.6-sles10.patch @@ -0,0 +1,15 @@ +--- + fs/ext3/super.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.16.21-0.8.orig/fs/ext3/super.c ++++ linux-2.6.16.21-0.8/fs/ext3/super.c +@@ -1425,7 +1425,7 @@ static int ext3_fill_super (struct super + sbi->s_resgid = le16_to_cpu(es->s_def_resgid); + + /* enable barriers by default */ +- set_opt(sbi->s_mount_opt, BARRIER); ++ /* set_opt(sbi->s_mount_opt, BARRIER); */ + set_opt(sbi->s_mount_opt, RESERVATION); + + if (!parse_options ((char *) data, sb, &journal_inum, &journal_devnum, diff --git a/lustre/kernel_patches/series/ldiskfs-2.6-sles10.series b/lustre/kernel_patches/series/ldiskfs-2.6-sles10.series index a20d75ab9e600c19c4284fb1848851007f7023d4..11f62b04fb3f91d7386ad965445ea0b6978a4037 100644 --- a/lustre/kernel_patches/series/ldiskfs-2.6-sles10.series +++ b/lustre/kernel_patches/series/ldiskfs-2.6-sles10.series @@ -10,5 +10,5 @@ ext3-nlinks-2.6.9.patch ext3-ialloc-2.6.patch ext3-remove-cond_resched-calls-2.6.12.patch ext3-filterdata-2.6.15.patch -ext3-disable-write-barrier-by-default-2.6-sles10.patch +ext3-disable-write-bar-by-default-2.6-sles10.patch ext3-nanosecond-2.6-sles10.patch diff --git a/lustre/kernel_patches/series/ldiskfs2-2.6-sles10.series b/lustre/kernel_patches/series/ldiskfs2-2.6-sles10.series index a20d75ab9e600c19c4284fb1848851007f7023d4..11f62b04fb3f91d7386ad965445ea0b6978a4037 100644 --- a/lustre/kernel_patches/series/ldiskfs2-2.6-sles10.series +++ b/lustre/kernel_patches/series/ldiskfs2-2.6-sles10.series @@ -10,5 +10,5 @@ ext3-nlinks-2.6.9.patch ext3-ialloc-2.6.patch ext3-remove-cond_resched-calls-2.6.12.patch ext3-filterdata-2.6.15.patch -ext3-disable-write-barrier-by-default-2.6-sles10.patch +ext3-disable-write-bar-by-default-2.6-sles10.patch ext3-nanosecond-2.6-sles10.patch