b=22847 separate format and content in ext[34]_warning()

ext{3,4}_warning should not try to overload the message into the format
but should instead, pass a "%s" as the format and the string as an argument
for the %s.

i=panda
i=whitebear

diff --git a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-rhel4.patch b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-rhel4.patch
index e7b8329..4428ba0 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-rhel4.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-rhel4.patch
@@ -92,7 +92,7 @@ Index: linux-2.6.9-67.0.22/fs/ext3/super.c
 +static void dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
 +                       const char *function, const char *msg)
 +{
-+      ext3_warning(sb, function, msg);
++      ext3_warning(sb, function, "%s", msg);
 +      ext3_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),

diff --git a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
index c5c50ff..0a4f9db 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
@@ -137,7 +137,7 @@ Index: linux-stage/fs/ext3/super.c
 +static void dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
 +                       const char *function, const char *msg)
 +{
-+      ext3_warning(sb, function, msg);
++      ext3_warning(sb, function, "%s", msg);
 +      ext3_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),

diff --git a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch
index 2f0654c..c608907 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch
@@ -137,7 +137,7 @@ Index: linux-stage/fs/ext3/super.c
 +static void dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
 +                       const char *function, const char *msg)
 +{
-+      ext3_warning(sb, function, msg);
++      ext3_warning(sb, function, "%s", msg);
 +      ext3_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),

diff --git a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla.patch
index 527b928..12c90a0 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla.patch
@@ -92,7 +92,7 @@ Index: linux-2.6.22.14/fs/ext3/super.c
 +static void dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
 +                       const char *function, const char *msg)
 +{
-+      ext3_warning(sb, function, msg);
++      ext3_warning(sb, function, "%s", msg);
 +      ext3_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),

diff --git a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch
index 94c8c1c..f896dd4 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch
@@ -92,7 +92,7 @@ Index: linux-stage/fs/ext4/super.c
 +static 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, "%s", msg);
 +      ext4_warning(sb, function, "MMP failure info: last update time: %llu, "
 +                   "last update node: %s, last update device: %s\n",
 +                   le64_to_cpu(mmp->mmp_time), mmp->mmp_nodename,

diff --git a/ldiskfs/kernel_patches/patches/ext4-mmp-sles11.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-sles11.patch
index b6ead02..308a04a 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-mmp-sles11.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-mmp-sles11.patch
@@ -98,7 +98,7 @@ Index: linux-stage/fs/ext4/super.c
 +static 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, "%s", msg);
 +      ext4_warning(sb, function, "MMP failure info: last update time: %llu, "
 +                   "last update node: %s, last update device: %s\n",
 +                   le64_to_cpu(mmp->mmp_time), mmp->mmp_nodename,