UKERNEL: Avoid using parameters named "new"

[openafs.git] / src / afs / UKERNEL / afs_usrops.h

diff --git a/src/afs/UKERNEL/afs_usrops.h b/src/afs/UKERNEL/afs_usrops.h
index d475fe5..dc59541 100644 (file)
--- a/src/afs/UKERNEL/afs_usrops.h
+++ b/src/afs/UKERNEL/afs_usrops.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
- * 
+ *
  * This software has been released under the terms of the IBM Public
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
@@ -10,9 +10,10 @@
 #ifndef __AFS_USROPS_H__
 #define __AFS_USROPS_H__ 1
 
-#if !defined(UKERNEL)
-#include <afs/sysincludes.h>
-#endif /* !defined(UKERNEL) */
+#ifdef KERNEL
+# include "afs/sysincludes.h"
+# include "afsincludes.h"
+#endif /* KERNEL */
 
 /*
  * Macros to manipulate doubly linked lists
@@ -51,25 +52,19 @@
     _ELEM->_PREV = NULL; \
 }
 
+extern char *uafs_mountDir;
+
 extern struct afsconf_dir *afs_cdir;
 extern char afs_LclCellName[64];
 
 extern int afs_osicred_Initialized;
 
-extern struct usr_vnode *afs_RootVnode;
-
-extern struct usr_vnode *afs_CurrentDir;
-extern struct usr_vnode *afs_FileTable[];
-extern int afs_FileFlags[];
-extern off_t afs_FileOffsets[];
-
-extern char afs_mountDir[];
-extern int afs_mountDirLen;
-
 extern void uafs_InitClient(void);
 extern void uafs_InitThread(void);
-extern void uafs_Init(char *, char *, char *, char *, int, int, int, int, int,
-                     int, int, int, int, int, char *);
+extern int uafs_Setup(const char *mount);
+extern int uafs_ParseArgs(int argc, char **argv);
+extern int uafs_Run(void);
+extern const char* uafs_MountDir(void);
 extern void uafs_RxServerProc(void);
 extern int uafs_LookupLink(struct usr_vnode *vp, struct usr_vnode *parentP,
                           struct usr_vnode **vpp);
@@ -123,10 +118,10 @@ extern int uafs_rmdir(char *path);
 extern int uafs_rmdir_r(char *path);
 extern int uafs_readlink(char *path, char *buf, int len);
 extern int uafs_readlink_r(char *path, char *buf, int len);
-extern int uafs_link(char *existing, char *new);
-extern int uafs_link_r(char *existing, char *new);
-extern int uafs_rename(char *old, char *new);
-extern int uafs_rename_r(char *old, char *new);
+extern int uafs_link(char *existing, char *newfile);
+extern int uafs_link_r(char *existing, char *newfile);
+extern int uafs_rename(char *old, char *newfile);
+extern int uafs_rename_r(char *old, char *newfile);
 extern int uafs_FlushFile(char *path);
 extern int uafs_FlushFile_r(char *path);
 extern usr_DIR *uafs_opendir(char *path);
@@ -149,5 +144,12 @@ extern int uafs_RPCStatsEnableProc(void);
 extern int uafs_RPCStatsDisableProc(void);
 extern int uafs_RPCStatsEnablePeer(void);
 extern int uafs_RPCStatsDisablePeer(void);
+extern int uafs_IsRoot(char *path);
+extern int uafs_statmountpoint_r(char *path);
+extern int uafs_statvfs(struct statvfs *buf);
+extern void uafs_Shutdown(void);
+extern void uafs_mount(void);
+extern void uafs_setMountDir(const char *dir);
+extern int uafs_fork(int wait, void* (*cbf) (void *), void *rock);
 
 #endif /* __AFS_USROPS_H__ */