The following commit has been merged in the master branch:
commit 3d9454fd4b98850ae47f0dbf980a5ca076d0d5bf
Author: Marco Nelles <marco.nel...@credativ.de>
Date:   Wed Jul 4 15:18:16 2012 +0200

    LDISKFS kernel patchset adapted

diff --git a/debian/patches/ldiskfs-kernel-patchset.patch 
b/debian/patches/ldiskfs-kernel-patchset.patch
index 76cf126..f943f1d 100644
--- a/debian/patches/ldiskfs-kernel-patchset.patch
+++ b/debian/patches/ldiskfs-kernel-patchset.patch
@@ -3882,7 +3882,7 @@ index 0000000..37bd4e8
 +                             "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..ca1903d
+index 0000000..c1ddbf5
 --- /dev/null
 +++ b/ldiskfs/kernel_patches/patches/ext4-mmp-2.6.32-vanilla.patch
 @@ -0,0 +1,575 @@
@@ -3907,8 +3907,8 @@ index 0000000..ca1903d
 +
 +Index: linux-source-2.6.32/fs/ext4/Makefile
 +===================================================================
-+--- linux-source-2.6.32.orig/fs/ext4/Makefile 2012-07-03 16:01:41.000000000 
+0200
-++++ linux-source-2.6.32/fs/ext4/Makefile      2012-07-03 16:27:38.777375531 
+0200
++--- linux-source-2.6.32.orig/fs/ext4/Makefile 2012-07-04 11:28:46.265375281 
+0200
+++++ linux-source-2.6.32/fs/ext4/Makefile      2012-07-04 15:08:46.055324677 
+0200
 +@@ -6,7 +6,8 @@
 + 
 + ext4-y       := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
@@ -3921,8 +3921,8 @@ index 0000000..ca1903d
 + ext4-$(CONFIG_EXT4_FS_POSIX_ACL)     += acl.o
 +Index: linux-source-2.6.32/fs/ext4/ext4.h
 +===================================================================
-+--- linux-source-2.6.32.orig/fs/ext4/ext4.h   2012-07-03 16:19:58.000000000 
+0200
-++++ linux-source-2.6.32/fs/ext4/ext4.h        2012-07-03 16:27:38.781380104 
+0200
++--- linux-source-2.6.32.orig/fs/ext4/ext4.h   2012-07-04 15:08:45.386700893 
+0200
+++++ linux-source-2.6.32/fs/ext4/ext4.h        2012-07-04 15:08:46.055324677 
+0200
 +@@ -963,7 +963,7 @@
 +      __le16  s_want_extra_isize;     /* New inodes should reserve # bytes */
 +      __le32  s_flags;                /* Miscellaneous flags */
@@ -4020,8 +4020,8 @@ index 0000000..ca1903d
 +  * Function prototypes
 +  */
 + 
-+@@ -1617,6 +1682,10 @@
-+      __attribute__ ((format (printf, 3, 4)));
++@@ -1621,6 +1686,10 @@
++ #define ext4_warning(sb, message...)   __ext4_warning(sb, __func__, ## 
message)
 + extern void ext4_msg(struct super_block *, const char *, const char *, ...)
 +      __attribute__ ((format (printf, 3, 4)));
 ++extern void __dump_mmp_msg(struct super_block *, struct mmp_struct *mmp,
@@ -4031,7 +4031,7 @@ index 0000000..ca1903d
 + extern void ext4_grp_locked_error(struct super_block *, ext4_group_t,
 +                              const char *, const char *, ...)
 +      __attribute__ ((format (printf, 4, 5)));
-+@@ -1899,6 +1968,8 @@
++@@ -1903,6 +1972,8 @@
 +                           __u64 start_orig, __u64 start_donor,
 +                           __u64 len, __u64 *moved_len);
 + 
@@ -4043,7 +4043,7 @@ index 0000000..ca1903d
 +Index: linux-source-2.6.32/fs/ext4/mmp.c
 +===================================================================
 +--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-++++ linux-source-2.6.32/fs/ext4/mmp.c 2012-07-03 16:27:38.781380104 +0200
+++++ linux-source-2.6.32/fs/ext4/mmp.c 2012-07-04 15:08:46.059236238 +0200
 +@@ -0,0 +1,351 @@
 ++#include <linux/fs.h>
 ++#include <linux/random.h>
@@ -4398,8 +4398,8 @@ index 0000000..ca1903d
 ++
 +Index: linux-source-2.6.32/fs/ext4/super.c
 +===================================================================
-+--- linux-source-2.6.32.orig/fs/ext4/super.c  2012-07-03 16:27:30.801547554 
+0200
-++++ linux-source-2.6.32/fs/ext4/super.c       2012-07-03 16:27:38.781380104 
+0200
++--- linux-source-2.6.32.orig/fs/ext4/super.c  2012-07-04 15:08:45.390738723 
+0200
+++++ linux-source-2.6.32/fs/ext4/super.c       2012-07-04 15:08:46.059236238 
+0200
 +@@ -40,6 +40,8 @@
 + #include <linux/log2.h>
 + #include <linux/crc16.h>
@@ -5411,10 +5411,10 @@ index 0000000..3231e6c
 +              if (err < 0)
 diff --git 
a/ldiskfs/kernel_patches/patches/ext4-update-vanilla-2.6.32-vanilla.patch 
b/ldiskfs/kernel_patches/patches/ext4-update-vanilla-2.6.32-vanilla.patch
 new file mode 100644
-index 0000000..d4a6ade
+index 0000000..73f93e0
 --- /dev/null
 +++ b/ldiskfs/kernel_patches/patches/ext4-update-vanilla-2.6.32-vanilla.patch
-@@ -0,0 +1,516 @@
+@@ -0,0 +1,536 @@
 +Index: linux-source-2.6.32/fs/ext4/ext4.h
 +===================================================================
 +--- linux-source-2.6.32.orig/fs/ext4/ext4.h   2012-07-03 16:19:56.981378031 
+0200
@@ -5477,6 +5477,26 @@ index 0000000..d4a6ade
 + /* inode.c */
 + int ext4_forget(handle_t *handle, int is_metadata, struct inode *inode,
 +              struct buffer_head *bh, ext4_fsblk_t blocknr);
++@@ -1586,13 +1616,17 @@ extern int ext4_group_extend(struct supe
++                              ext4_fsblk_t n_blocks_count);
++ 
++ /* super.c */
++-extern void ext4_error(struct super_block *, const char *, const char *, ...)
+++extern void __ext4_error(struct super_block *, const char *, const char *, 
...)
+++     __attribute__ ((format (printf, 3, 4)));
+++#define ext4_error(sb, message...)     __ext4_error(sb, __func__, ## message)
+++extern void ext4_error_inode(const char *, struct inode *, const char *, ...)
++      __attribute__ ((format (printf, 3, 4)));
++ extern void __ext4_std_error(struct super_block *, const char *, int);
++ extern void ext4_abort(struct super_block *, const char *, const char *, ...)
++      __attribute__ ((format (printf, 3, 4)));
++-extern void ext4_warning(struct super_block *, const char *, const char *, 
...)
+++extern void __ext4_warning(struct super_block *, const char *, const char *, 
...)
++      __attribute__ ((format (printf, 3, 4)));
+++#define ext4_warning(sb, message...)   __ext4_warning(sb, __func__, ## 
message)
++ extern void ext4_msg(struct super_block *, const char *, const char *, ...)
++      __attribute__ ((format (printf, 3, 4)));
++ extern void ext4_grp_locked_error(struct super_block *, ext4_group_t,
 +Index: linux-source-2.6.32/fs/ext4/ext4_extents.h
 +===================================================================
 +--- linux-source-2.6.32.orig/fs/ext4/ext4_extents.h   2012-07-03 
16:19:55.725400261 +0200

-- 
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