diff options
author | Nikitas Angelinas <nikitasangelinas@gmail.com> | 2011-10-18 10:49:51 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2011-10-18 10:49:51 -0400 |
commit | 215fc6af739d2dfdcad5496248d0d6302eb8a604 (patch) | |
tree | 919d11683117ec90b623792f475f09017db1f45a /fs/ext4 | |
parent | f472e02669073e4f1a388142bafa0f806fae841c (diff) | |
download | linux-215fc6af739d2dfdcad5496248d0d6302eb8a604.tar.gz linux-215fc6af739d2dfdcad5496248d0d6302eb8a604.tar.bz2 linux-215fc6af739d2dfdcad5496248d0d6302eb8a604.zip |
ext4: MMP: kmmpd should use nodename from init_uts_ns.name, not sysname
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.
Acked-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Nikitas Angelinas <nikitas_angelinas@xyratex.com>
Signed-off-by: Andrew Perepechko <andrew_perepechko@xyratex.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r-- | 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 9bdef3f537c5..2fca64efd6db 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()) { |