The following commit has been merged in the master branch:
commit 80c1e66ebc83328cf7919bd2a3802c6edda6ff05
Author: Marco Nelles <marco.nel...@credativ.com>
Date:   Thu Jun 28 14:22:53 2012 +0200

    Fixed ldiskfs kernel patchset

diff --git a/debian/patches/ldiskfs-kernel-patchset.patch 
b/debian/patches/ldiskfs-kernel-patchset.patch
index a455804..6104e62 100644
--- a/debian/patches/ldiskfs-kernel-patchset.patch
+++ b/debian/patches/ldiskfs-kernel-patchset.patch
@@ -1304,40 +1304,41 @@ index 0000000..c462357
 ++#include_next <fiemap.h>
 diff --git 
a/ldiskfs/kernel_patches/patches/ext4-force_over_128tb-2.6.32-vanilla.patch 
b/ldiskfs/kernel_patches/patches/ext4-force_over_128tb-2.6.32-vanilla.patch
 new file mode 100644
-index 0000000..487b2cc
+index 0000000..6bc65dc
 --- /dev/null
 +++ b/ldiskfs/kernel_patches/patches/ext4-force_over_128tb-2.6.32-vanilla.patch
-@@ -0,0 +1,56 @@
-+Index: linux-2.6.18-164.6.1/fs/ext4/super.c
+@@ -0,0 +1,57 @@
++Index: linux-source-2.6.32/fs/ext4/super.c
 +===================================================================
-+--- linux-2.6.18-164.6.1.orig/fs/ext4/super.c
-++++ linux-2.6.18-164.6.1/fs/ext4/super.c
-+@@ -51,6 +51,8 @@
-+ 
++--- linux-source-2.6.32.orig/fs/ext4/super.c  2012-06-28 12:10:26.929665337 
+0200
+++++ linux-source-2.6.32/fs/ext4/super.c       2012-06-28 12:10:32.945663837 
+0200
++@@ -55,6 +55,8 @@
 + struct proc_dir_entry *ext4_proc_root;
++ static struct kset *ext4_kset;
 + 
 ++static int force_over_128tb;
 ++
 + static int ext4_load_journal(struct super_block *, struct ext4_super_block *,
 +                           unsigned long journal_devnum);
-+ static int ext4_commit_super(struct super_block *sb,
-+@@ -1343,6 +1345,7 @@ enum {
++ static int ext4_commit_super(struct super_block *sb, int sync);
++@@ -1109,7 +1111,7 @@
 +      Opt_stripe, Opt_delalloc, Opt_nodelalloc,
++      Opt_block_validity, Opt_noblock_validity,
 +      Opt_inode_readahead_blks, Opt_journal_ioprio,
-+      Opt_iopen, Opt_noiopen, Opt_iopen_nopriv, Opt_bigendian_extents,
-++     Opt_force_over_128tb,
++-     Opt_mballoc, Opt_bigendian_extents,
+++     Opt_mballoc, Opt_bigendian_extents, Opt_force_over_128tb,
++      Opt_discard, Opt_nodiscard,
 + };
 + 
-+ static match_table_t tokens = {
-+@@ -1410,6 +1413,7 @@ static match_table_t tokens = {
++@@ -1180,6 +1182,7 @@
 +      {Opt_auto_da_alloc, "auto_da_alloc"},
 +      {Opt_noauto_da_alloc, "noauto_da_alloc"},
 +      {Opt_bigendian_extents, "bigendian_extents"},
 ++     {Opt_force_over_128tb, "force_over_128tb"},
-+      {Opt_err, NULL},
-+ };
-+ 
-+@@ -1837,6 +1841,9 @@ set_qf_format:
++      {Opt_mballoc, "mballoc"},
++      {Opt_discard, "discard"},
++      {Opt_nodiscard, "nodiscard"},
++@@ -1626,6 +1629,9 @@
 +                      break;
 +              case Opt_mballoc:
 +                      break;
@@ -1345,9 +1346,9 @@ index 0000000..487b2cc
 ++                     force_over_128tb = 1;
 ++                     break;
 +              default:
-+                      printk(KERN_ERR
-+                             "EXT4-fs: Unrecognized mount option \"%s\" "
-+@@ -2692,6 +2699,16 @@ static int ext4_fill_super(struct super_
++                      ext4_msg(sb, KERN_ERR,
++                             "Unrecognized mount option \"%s\" "
++@@ -2651,6 +2657,16 @@
 +              goto failed_mount;
 +      }
 + 
@@ -8579,3 +8580,46 @@ index 0000000..7166474
 + 
 + ext4-$(CONFIG_EXT4_FS_XATTR)         += xattr.o xattr_user.o xattr_trusted.o
 + ext4-$(CONFIG_EXT4_FS_POSIX_ACL)     += acl.o
+diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6.32-vanilla.series 
b/ldiskfs/kernel_patches/series/ldiskfs-2.6.32-vanilla.series
+new file mode 100644
+index 0000000..e402bef
+--- /dev/null
++++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6.32-vanilla.series
+@@ -0,0 +1,37 @@
++ext4-wantedi-2.6.32-vanilla.patch
++ext4-map_inode_page-2.6.32-vanilla.patch
++export-ext4-2.6.32-vanilla.patch
++ext4-remove-cond_resched-calls-2.6.32-vanilla.patch
++ext4-nlink-2.6.32-vanilla.patch
++ext4-ext_generation-2.6.32-vanilla.patch
++ext4-inode-version-2.6.32-vanilla.patch
++ext4-mmp-2.6.32-vanilla.patch
++ext4-lookup-dotdot-2.6.32-vanilla.patch
++ext4-max-dir-size-2.6.32-vanilla.patch
++ext4-print-inum-in-htree-warning-2.6.32-vanilla.patch
++ext4-xattr-no-update-ctime-2.6.32-vanilla.patch
++ext4-prealloc-2.6.32-vanilla.patch
++ext4-mballoc-extra-checks-2.6.32-vanilla.patch
++ext4-misc-2.6.32-vanilla.patch 
++ext4-big-endian-check-2.6.32-vanilla.patch
++ext4-alloc-policy-2.6.32-vanilla.patch
++ext4-force_over_128tb-2.6.32-vanilla.patch
++ext4-pdir-fix-2.6.32-vanilla.patch
++ext4-osd-iop-common-2.6.32-vanilla.patch
++ext4-osd-iam-exports-2.6.32-vanilla.patch
++ext4-dynlocks-common-2.6.32-vanilla.patch
++ext4-hash-indexed-dir-dotdot-update-2.6.32-vanilla.patch
++ext4-kill-dx_root-2.6.32-vanilla.patch
++ext4-extents-mount-option-2.6.32-vanilla.patch
++ext4-fiemap-2.6.32-vanilla.patch
++ext4-mballoc-pa_free-mismatch-2.6.32-vanilla.patch
++ext4_data_in_dirent-2.6.32-vanilla.patch
++ext4-large-eas-2.6.32-vanilla.patch
++ext4-disable-mb-cache-2.6.32-vanilla.patch
++ext4-back-dquot-to-2.6.32-vanilla.patch
++ext4-nocmtime-2.6.32-vanilla.patch
++ext4-export-64bit-name-hash-2.6.32-vanilla.patch
++ext4-vmalloc-2.6.32-vanilla.patch
++ext4-journal-callback-2.6.32-vanilla.patch
++ext4-store-tree-generation-at-find-2.6.32-vanilla.patch
++ext4_pdirop-2.6.32-vanilla.patch

-- 
Lustre Debian Packaging 

_______________________________________________
Pkg-lustre-svn-commit mailing list
Pkg-lustre-svn-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-lustre-svn-commit

Reply via email to