From: Ben Kaduk <kaduk@mit.edu>
Date: Sat, 6 Mar 2010 19:51:17 +0000 (-0500)
Subject: Be type correct in osi_ThreadUnique() for FBSD
X-Git-Tag: openafs-devel-1_5_73~87
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2f9df771bbe418b9d1a3797a844c6965d0c1325f;p=packages%2Fo%2Fopenafs.git

Be type correct in osi_ThreadUnique() for FBSD

Formerly, in AFS_FBSD50_ENV, we used curproc for the ThreadUnique
value; however, curproc (#defined as curthread->td_proc) is a
struct proc *, not an actual pid.  (As such, it suffers from
a 32/64-bit mismatch on 64-bit systems.)  Use the correct value,
curproc->p_pid, instead.

Change-Id: If07ef3b0814c0fee63b62d2f36fa94d6e45573b9
Reviewed-on: http://gerrit.openafs.org/1528
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h
index 5f6588b03..488334a52 100644
--- a/src/afs/afs_osi.h
+++ b/src/afs/afs_osi.h
@@ -185,7 +185,7 @@ typedef struct timeval osi_timeval_t;
  */
 #ifdef AFS_FBSD50_ENV
 /* should use curthread, but 'ps' can't display it */
-#define osi_ThreadUnique()	curproc
+#define osi_ThreadUnique()	(curproc->p_pid)
 #elif defined(AFS_LINUX_ENV)
 #define osi_ThreadUnique()	(current->pid)
 #elif defined(UKERNEL)