Be type correct in osi_ThreadUnique() for FBSD

[openafs.git] / src / afs / afs_osi.h

diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h
index 66c2e05..488334a 100644 (file)
--- a/src/afs/afs_osi.h
+++ b/src/afs/afs_osi.h
@@ -68,7 +68,6 @@ struct osi_file {
 #endif
     int (*proc) (struct osi_file * afile, afs_int32 code);     /* proc, which, if not null, is called on writes */
     char *rock;                        /* rock passed to proc */
-    ino_t inum;                        /* guarantee validity of hint */
 #if defined(UKERNEL)
     int fd;                    /* file descriptor for user space files */
 #endif                         /* defined(UKERNEL) */
@@ -186,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)
@@ -389,8 +388,10 @@ typedef struct timeval osi_timeval_t;
 /*
  * encapsulation of kernel data structure accesses
  */
+#ifndef UKERNEL
 #define setuerror(erval)       u.u_error = (erval)
 #define getuerror()            u.u_error
+#endif
 
 /* Macros for vcache/vnode and vfs arguments to vnode and vfs ops.
  * These are required for IRIX 6.4 and later, which pass behavior pointers.