From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 29 Nov 2005 06:54:46 +0000 (+0000)
Subject: STABLE14-macos103-update-20051129
X-Git-Tag: openafs-stable-1_4_1-rc2~14
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4618c845355703722378257afb06814526d2beab;p=packages%2Fo%2Fopenafs.git

STABLE14-macos103-update-20051129


make the kernel module work too


(cherry picked from commit d94337feafeabe053d8fa4c6296ef776e4fd2597)
---

diff --git a/src/afs/DARWIN/osi_machdep.h b/src/afs/DARWIN/osi_machdep.h
index 0026eff0f..da269fb5c 100644
--- a/src/afs/DARWIN/osi_machdep.h
+++ b/src/afs/DARWIN/osi_machdep.h
@@ -219,6 +219,18 @@ uio_t afsio_darwin_partialcopy(uio_t auio, int size);
 #define uprintf printf
 #endif
 
+#ifndef AFS_DARWIN80_ENV
+#define ifaddr_address_family(x) (x)->ifa_addr->sa_family
+#define ifaddr_address(x, y, z) memcpy(y, (x)->ifa_addr, z)
+#define ifaddr_netmask(x, y, z) memcpy(y, (x)->ifa_netmask, z)
+#define ifaddr_dstaddress(x, y, z) memcpy(y, (x)->ifa_dstaddr, z)
+#define ifaddr_ifnet(x) (x?(x)->ifa_ifp:0)
+#define ifnet_flags(x) (x?(x)->if_flags:0)
+#define ifnet_metric(x) (x?(x)->if_data.ifi_metric:0)
+/*#define ifnet_mtu(x) (x)->if_mtu*/
+#define ifaddr_withnet(x) ifa_ifwithnet(x)
+#endif
+
 #endif /* KERNEL */
 
 #endif /* _OSI_MACHDEP_H_ */
diff --git a/src/afs/DARWIN/osi_vnodeops.c b/src/afs/DARWIN/osi_vnodeops.c
index a889ba2cb..06e43147a 100644
--- a/src/afs/DARWIN/osi_vnodeops.c
+++ b/src/afs/DARWIN/osi_vnodeops.c
@@ -1589,7 +1589,7 @@ afs_vop_inactive(ap)
     register struct vnode *vp = ap->a_vp;
     struct vcache *tvc = VTOAFS(vp);
 #ifndef AFS_DARWIN80_ENV
-    if (prtactive && vnode_isinuse(vp, 0) != 0)
+    if (prtactive && vp->v_usecount != 0)
 	vprint("afs_vop_inactive(): pushing active", vp);
 #endif
     if (tvc) {
diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index 3015a0114..4cc32966d 100644
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -155,18 +155,6 @@ extern rxk_portRocks_t rxk_portRocks;
 extern struct domain inetdomain;
 #endif /* AFS_XBSD_ENV */
 
-#ifndef AFS_DARWIN80_ENV
-#define ifaddr_address_family(x) (x)->ifa_addr->sa_family
-#define ifaddr_address(x, y, z) memcpy(y, (x)->ifa_addr, z)
-#define ifaddr_netmask(x, y, z) memcpy(y, (x)->ifa_netmask, z)
-#define ifaddr_dstaddress(x, y, z) memcpy(y, (x)->ifa_dstaddr, z)
-#define ifaddr_ifnet(x) (x?(x)->ifa_ifp:0)
-#define ifnet_flags(x) (x?(x)->if_flags:0)
-#define ifnet_metric(x) (x?(x)->if_data.ifi_metric:0)
-/*#define ifnet_mtu(x) (x)->if_mtu*/
-#define ifaddr_withnet(x) ifa_ifwithnet(x)
-#endif
-
 #endif /* _RX_KCOMMON_H_ */
 
 #endif