git: 21ce674e3c7e - main - Merge commit 956f94010 from openzfs git (by Ryan Libby):

[Ryan Libby]

The branch main has been updated by rlibby:

URL: https://cgit.FreeBSD.org/src/commit/?id=21ce674e3c7e9dad485b0d84634616f0b535a17f

commit 21ce674e3c7e9dad485b0d84634616f0b535a17f
Author:     Ryan Libby <rlibby at FreeBSD.org>
AuthorDate: 2020-12-27 22:33:13 +0000
Commit:     Ryan Libby <rlibby at FreeBSD.org>
CommitDate: 2020-12-27 22:33:13 +0000

    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 at llnl.gov>
      Signed-off-by: Ryan Libby <rlibby at FreeBSD.org>
      Closes #11336
---
 sys/contrib/openzfs/include/sys/spa_impl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 */