Re: [PATCH 1/2] ext4: MMP: kmmpd should use nodename from init_uts_ns.name, not sysname
From: Andreas Dilger <adilger.kernel@dilger.ca>
Date: 2011-09-23 18:51:09
Also in:
lkml
On 2011-09-22, at 6:23 PM, Nikitas Angelinas wrote:
sysname holds "Linux" by default, i.e. what appears when doing a "uname -s"; nodename should be used to print the machine's hostname, i.e. what is returned when doing a "uname -n" or "hostname", and what gethostname(2)/sethostname(2) manipulate, in order to notify the administrator of the node which is contending to mount the filesystem. Signed-off-by: Nikitas Angelinas <redacted> Signed-off-by: Andrew Perepechko <redacted>
This looks to have crept in with the port of the patch to RHEL6, which
required the code to stop accessing system_utsname directly and instead
using the init_utsname() helper to access the structure. That version
of the patch was contributed by an external developer, so I can't really
say why it was done, probably just an oversight. In our RHEL5 patch it
used to be:
memcpy(mmp->mmp_nodename, system_utsname.nodename,
sizeof(mmp->mmp_nodename));
You can add Acked-by: Andreas Dilger [off-list ref].
Thanks for the fix.
quoted hunk ↗ jump to hunk
--- fs/ext4/mmp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c index 9bdef3f..2fca64e 100644 --- a/fs/ext4/mmp.c +++ b/fs/ext4/mmp.c@@ -109,7 +109,7 @@ static int kmmpd(void *data)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()) { -- 1.7.4.4 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Cheers, Andreas