diff options
Diffstat (limited to 'module')
| -rw-r--r-- | module/spl/spl-generic.c | 4 | ||||
| -rw-r--r-- | module/spl/spl-proc.c | 6 | ||||
| -rw-r--r-- | module/zfs/spa_history.c | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c index 7c1ad390b..a22e93e36 100644 --- a/module/spl/spl-generic.c +++ b/module/spl/spl-generic.c @@ -45,9 +45,9 @@ #include <sys/random.h> #include <sys/strings.h> #include <linux/kmod.h> +#include "zfs_gitrev.h" -char spl_version[32] = "SPL v" ZFS_META_VERSION "-" ZFS_META_RELEASE; -EXPORT_SYMBOL(spl_version); +char spl_gitrev[64] = ZFS_META_GITREV; /* BEGIN CSTYLED */ unsigned long spl_hostid = 0; 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, }, diff --git a/module/zfs/spa_history.c b/module/zfs/spa_history.c index 969fdb000..b590a1d57 100644 --- a/module/zfs/spa_history.c +++ b/module/zfs/spa_history.c @@ -38,6 +38,7 @@ #include <sys/sunddi.h> #include <sys/cred.h> #include "zfs_comutil.h" +#include "zfs_gitrev.h" #ifdef _KERNEL #include <sys/zone.h> #endif @@ -617,8 +618,8 @@ spa_history_log_version(spa_t *spa, const char *operation, dmu_tx_t *tx) utsname_t *u = utsname(); spa_history_log_internal(spa, operation, tx, - "pool version %llu; software version %llu/%llu; uts %s %s %s %s", - (u_longlong_t)spa_version(spa), SPA_VERSION, ZPL_VERSION, + "pool version %llu; software version %s; uts %s %s %s %s", + (u_longlong_t)spa_version(spa), ZFS_META_GITREV, u->nodename, u->release, u->version, u->machine); } |