c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 10:01:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

zpool: main: const correctness, use time_t for time

Browse Source 
The cast will explode on 32-bit big-endian architectures

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12968
This commit is contained in:
наб 2022-01-12 17:26:04 +01:00 committed by Brian Behlendorf
parent fdcb79b52e
commit bf12053cb2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/zpool/zpool_main.c
View File

@ -3136,7 +3136,7 @@ do_import(nvlist_t *config, const char *newname, const char *mntopts,
{ {
int ret = 0; int ret = 0;
zpool_handle_t *zhp; zpool_handle_t *zhp;
char *name; const char *name;
uint64_t version; uint64_t version;
name = fnvlist_lookup_string(config, ZPOOL_CONFIG_POOL_NAME); name = fnvlist_lookup_string(config, ZPOOL_CONFIG_POOL_NAME);
@ -3157,7 +3157,7 @@ do_import(nvlist_t *config, const char *newname, const char *mntopts,
ZPOOL_CONFIG_MMP_STATE); ZPOOL_CONFIG_MMP_STATE);
if (mmp_state == MMP_STATE_ACTIVE) { if (mmp_state == MMP_STATE_ACTIVE) {
char *hostname = "<unknown>"; const char *hostname = "<unknown>";
uint64_t hostid = 0; uint64_t hostid = 0;
if (nvlist_exists(nvinfo, ZPOOL_CONFIG_MMP_HOSTNAME)) if (nvlist_exists(nvinfo, ZPOOL_CONFIG_MMP_HOSTNAME))
@ -3179,8 +3179,8 @@ do_import(nvlist_t *config, const char *newname, const char *mntopts,
"system's hostid is not set. Set a unique hostid " "system's hostid is not set. Set a unique hostid "
"with the zgenhostid(8) command.\n"), name); "with the zgenhostid(8) command.\n"), name);
} else { } else {
char *hostname = "<unknown>"; const char *hostname = "<unknown>";
uint64_t timestamp = 0; time_t timestamp = 0;
uint64_t hostid = 0; uint64_t hostid = 0;
if (nvlist_exists(config, ZPOOL_CONFIG_HOSTNAME)) if (nvlist_exists(config, ZPOOL_CONFIG_HOSTNAME))
@ -3200,7 +3200,7 @@ do_import(nvlist_t *config, const char *newname, const char *mntopts,
"Last accessed by %s (hostid=%lx) at %s" "Last accessed by %s (hostid=%lx) at %s"
"The pool can be imported, use 'zpool import -f' " "The pool can be imported, use 'zpool import -f' "
"to import the pool.\n"), name, hostname, "to import the pool.\n"), name, hostname,
(unsigned long)hostid, ctime((time_t *)&timestamp)); (unsigned long)hostid, ctime(&timestamp));
} }
return (1); return (1);
@ -3210,7 +3210,7 @@ do_import(nvlist_t *config, const char *newname, const char *mntopts,
return (1); return (1);
if (newname != NULL) if (newname != NULL)
name = (char *)newname; name = newname;
if ((zhp = zpool_open_canfail(g_zfs, name)) == NULL) if ((zhp = zpool_open_canfail(g_zfs, name)) == NULL)
return (1); return (1);