diff options
| author | Ryan Libby <rlibby@FreeBSD.org> | 2020-12-27 22:33:13 +0000 |
|---|---|---|
| committer | Ryan Libby <rlibby@FreeBSD.org> | 2020-12-27 22:33:13 +0000 |
| commit | 21ce674e3c7e9dad485b0d84634616f0b535a17f (patch) | |
| tree | 7f3b409dc8d17b0c729ee9118a2eed0ab46c4bfe /sys/contrib | |
| parent | 48184e76619d4ac16300d45cfd9407e4aa388a58 (diff) | |
| download | src-21ce674e3c7e9dad485b0d84634616f0b535a17f.tar.gz src-21ce674e3c7e9dad485b0d84634616f0b535a17f.zip | |
Merge commit 956f94010 from openzfs git (by Ryan Libby):
spa: avoid type narrowing warning
Building the spa module for i386 caused gcc to emit
-Wint-to-pointer-cast "cast to pointer from integer of different size"
because spa.spa_did was uint64_t but pthread_join (via thread_join in
spa_deactivate) takes a pointer (32-bit on i386). Define spa_did to be
pointer-size instead. For now spa_did is in fact never non-zero and the
thread_join could instead be ifdef'd out, but changing the size of
spa_did may be more useful for the future.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Libby <rlibby@FreeBSD.org>
Closes #11336
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/openzfs/include/sys/spa_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/include/sys/spa_impl.h b/sys/contrib/openzfs/include/sys/spa_impl.h index 69de75fb6d3f..3eb87d2bb220 100644 --- a/sys/contrib/openzfs/include/sys/spa_impl.h +++ b/sys/contrib/openzfs/include/sys/spa_impl.h @@ -377,7 +377,7 @@ struct spa { kcondvar_t spa_proc_cv; /* spa_proc_state transitions */ spa_proc_state_t spa_proc_state; /* see definition */ proc_t *spa_proc; /* "zpool-poolname" process */ - uint64_t spa_did; /* if procp != p0, did of t1 */ + uintptr_t spa_did; /* if procp != p0, did of t1 */ boolean_t spa_autoreplace; /* autoreplace set in open */ int spa_vdev_locks; /* locks grabbed */ uint64_t spa_creation_version; /* version at pool creation */ |