[Pkg-lustre-svn-commit] updated: [7608847] LDISKFS kernel patchset adapted

[Marco Nelles]

The following commit has been merged in the master branch:
commit 7608847fc77b69f92f248a421196c65e1d7e27ec
Author: Marco Nelles <marco.nelles at credativ.de>
Date:   Thu Jul 5 13:33:22 2012 +0200

    LDISKFS kernel patchset adapted

diff --git a/debian/patches/ldiskfs-kernel-patchset.patch b/debian/patches/ldiskfs-kernel-patchset.patch
index 80c1f9c..1659478 100644
--- a/debian/patches/ldiskfs-kernel-patchset.patch
+++ b/debian/patches/ldiskfs-kernel-patchset.patch
@@ -3905,7 +3905,7 @@ index 0000000..a7e1236
 + 			       "Unrecognized mount option \"%s\" "
 diff --git a/ldiskfs/kernel_patches/patches/ext4-mmp-2.6.32-vanilla.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-2.6.32-vanilla.patch
 new file mode 100644
-index 0000000..e2f21f7
+index 0000000..6ebb6cf
 --- /dev/null
 +++ b/ldiskfs/kernel_patches/patches/ext4-mmp-2.6.32-vanilla.patch
 @@ -0,0 +1,575 @@
@@ -4141,8 +4141,8 @@ index 0000000..e2f21f7
 ++void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
 ++                   const char *function, const char *msg)
 ++{
-++       __ext4_warning(sb, function, msg);
-++       __ext4_warning(sb, function,
+++       ext4_warning(sb, function, msg);
+++       ext4_warning(sb, function,
 ++                      "MMP failure info: last update time: %llu, last update "
 ++                      "node: %s, last update device: %s\n",
 ++                      (long long unsigned int) le64_to_cpu(mmp->mmp_time),

-- 
Lustre Debian Packaging