From 4c96673ce3dddd8c0aadf7d45988635bd7df56ce Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 25 Apr 2005 00:40:35 +0000
Subject: [PATCH] STABLE14-cleanup-20050424

remaining pullups
---
 README.OBSOLETE             |  2 +-
 src/afs/LINUX/osi_machdep.h |  6 ++++++
 src/afs/OBSD/osi_machdep.h  |  2 --
 src/afs/afs_osi.h           | 14 +++++---------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.OBSOLETE b/README.OBSOLETE
index 2af6f10f0e..b7ccaaddbe 100644
--- a/README.OBSOLETE
+++ b/README.OBSOLETE
@@ -1,4 +1,4 @@
-The mpp and package included with AFS are obsolete. ntp is no longer included.
+The ntp, mpp and package included with AFS are obsolete.
 
 The ntp package is intended to only maintain time on servers; Clients
 get time from servers unless afsd is started with -nosettime. That said,
diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h
index 1ff8d5925b..208dd5672f 100644
--- a/src/afs/LINUX/osi_machdep.h
+++ b/src/afs/LINUX/osi_machdep.h
@@ -179,6 +179,12 @@ typedef struct uio {
 /* Get/set the inode in the osifile struct. */
 #define FILE_INODE(F) (F)->f_dentry->d_inode
 
+#ifdef AFS_LINUX24_ENV
+#define OSIFILE_INODE(a) FILE_INODE((a)->filp)
+#else
+#define OSIFILE_INODE(a) FILE_INODE(&(a)->file)
+#endif
+
 #if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV)
 #define NEED_IOCTL32
 #endif
diff --git a/src/afs/OBSD/osi_machdep.h b/src/afs/OBSD/osi_machdep.h
index 34e5fd0ab1..43a118b6c2 100644
--- a/src/afs/OBSD/osi_machdep.h
+++ b/src/afs/OBSD/osi_machdep.h
@@ -40,8 +40,6 @@ extern struct simplelock afs_rxglobal_lock;
 #define v_vfsp		v_mount
 
 /* vnode */
-#undef SetAfsVnode
-#define SetAfsVnode(vn)		/* nothing; done in getnewvnode() */
 #define VN_HOLD(vp)	afs_vget((vp), 0)
 #define VN_RELE(vp)	vrele(vp)
 #define osi_vnhold(avc, r) afs_vget(AFSTOV(avc), 0)
diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h
index a7ccfd848a..8299fec7eb 100644
--- a/src/afs/afs_osi.h
+++ b/src/afs/afs_osi.h
@@ -133,16 +133,14 @@ struct afs_osi_WaitHandle {
 #define	vSetVfsp(vc,vfsp)   (vc)->v.v_vfsp = (vfsp)
 #endif
 
-#ifndef AFS_OBSD_ENV
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 extern int (**afs_vnodeop_p) ();
-#define IsAfsVnode(vc)      ((vc)->v_op == afs_vnodeop_p)
-#define SetAfsVnode(vc)     /* nothing; done in getnewvnode() */
+#define IsAfsVnode(v)      ((v)->v_op == afs_vnodeop_p)
+#define SetAfsVnode(v)     /* nothing; done in getnewvnode() */
 #else
 extern struct vnodeops *afs_ops;
-#define	IsAfsVnode(vc)	    ((vc)->v_op == afs_ops)
-#define	SetAfsVnode(vc)	    (vc)->v_op = afs_ops
-#endif
+#define	IsAfsVnode(v)	    ((v)->v_op == afs_ops)
+#define	SetAfsVnode(v)	    (v)->v_op = afs_ops
 #endif
 
 #ifdef AFS_SGI65_ENV
@@ -150,11 +148,9 @@ extern struct vnodeops *afs_ops;
              lookupname((fnamep),(segflg),(followlink),NULL,(compvpp),\
 			NULL)
 #else
-#ifndef AFS_OBSD_ENV
 #define	gop_lookupname(fnamep,segflg,followlink,compvpp) \
              lookupname((fnamep),(segflg),(followlink),NULL,(compvpp))
 #endif
-#endif
 
 /*
  * In IRIX 6.5 we cannot have DEBUG turned on since certain