LU-717 ldiskfs: MRP-222 Replace sysname with nodename in MMP

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext4-mmp-sles11.patch

diff --git a/ldiskfs/kernel_patches/patches/ext4-mmp-sles11.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-sles11.patch
index 37923b2..d7d5694 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",
 +                   (long long unsigned int)le64_to_cpu(mmp->mmp_time),
@@ -139,7 +139,7 @@ Index: linux-stage/fs/ext4/super.c
 +      mmp->mmp_check_interval = cpu_to_le16(mmp_check_interval);
 +      bdevname(bh->b_bdev, mmp->mmp_bdevname);
 +
-+      memcpy(mmp->mmp_nodename, init_utsname()->sysname,
++      memcpy(mmp->mmp_nodename, init_utsname()->nodename,
 +             sizeof(mmp->mmp_nodename));
 +
 +      while (!kthread_should_stop()) {