From 4cbde2ecbf7c6478bac106fadd6a23f53d538262 Mon Sep 17 00:00:00 2001 From: Matthew Ahrens Date: Mon, 8 Oct 2018 21:57:02 -0700 Subject: Create /proc/sys/kernel/spl/gitrev with git hash The existing mechanisms for determining what code is running in the kernel do not always correctly report the git hash. The versions reported there do not reflect changes made since `configure` was run (i.e. incremental builds do not update the version) and they are misleading if git tags are not set up properly. This applies to `modinfo zfs`, `dmesg`, and `/sys/module/zfs/version`. There are complicated requirements on how the existing version is generated. Therefore we are leaving that alone, and adding a new mechanism to record and retrieve the git hash: `cat /proc/sys/kernel/spl/gitrev` The gitrev is re-generated at compile time, when running `make` (including for incremental builds). The value is the output of `git describe` (or "unknown" if not in a git repo or there are uncommitted changes). We're also removing /proc/sys/kernel/spl/version, which was never very useful. Reviewed by: Pavel Zakharov Reviewed by: Brian Behlendorf Reviewed by: Tim Chase Signed-off-by: Matthew Ahrens Closes #7931 Closes #7965 --- module/spl/spl-proc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/spl/spl-proc.c') diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c index 9c52924a4..a75bcc214 100644 --- a/module/spl/spl-proc.c +++ b/module/spl/spl-proc.c @@ -659,9 +659,9 @@ static struct ctl_table spl_table[] = { * sysctl(8) prefers to go via /proc for portability. */ { - .procname = "version", - .data = spl_version, - .maxlen = sizeof (spl_version), + .procname = "gitrev", + .data = spl_gitrev, + .maxlen = sizeof (spl_gitrev), .mode = 0444, .proc_handler = &proc_dostring, }, -- cgit v1.2.3