diff options
author | Olaf Faaland <[email protected]> | 2017-05-25 13:32:06 -0700 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2017-07-13 13:26:40 -0400 |
commit | 34ae0ae1749f297c23c3c1680ea552df94ae2122 (patch) | |
tree | 313af2d8e3abbb5b6cc313a8beee6cf293ce6774 /include/sys | |
parent | 12fa0466df8773fc6151e8b55367a1c4f76ec407 (diff) |
Make hostid consistent in user and kernel space
If no spl_hostid was set, and no /etc/hostid file existed, the user
and kernel would have different values for the hostid.
The kernel's would be 0. User space's would depend on the libc
implementation. On systems with glibc, it would be a generated value,
probably the first 4 bytes of an IP address (see man 3 gethostid and
comments above hostid_read in SPL for details).
This then causes the hostid stored in the labels and in the pool
config not to match the hostid userspace obtains from
get_system_hostid().
Since the kernel has no way to know the libc's generated hostid value,
it serves no purpose for ZFS to use the value.
This patch changes user space's get_system_hostid() to conform to the
kernel's method, first checking for the spl_hostid via sysfs, and then
reading from /etc/hostid directly.
It does not look up spl_hostid_path, because if that is set and the
file it pointed to exists, spl_hostid will reflect its contents.
It eliminates the call to libc's gethostid().
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: Ned Bass <[email protected]>
Reviewed-by: Andreas Dilger <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Olaf Faaland <[email protected]>
Closes #745
Closes #6279
Diffstat (limited to 'include/sys')
0 files changed, 0 insertions, 0 deletions