X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..0b4c1975fb5e4eccf1012a35081f7e7799b81046:/bsd/sys/filedesc.h

diff --git a/bsd/sys/filedesc.h b/bsd/sys/filedesc.h
index 816b411ca..7ea50f5a9 100644
--- a/bsd/sys/filedesc.h
+++ b/bsd/sys/filedesc.h
@@ -66,7 +66,6 @@
 
 #include <sys/appleapiopts.h>
 
-#ifdef __APPLE_API_UNSTABLE
 /*
  * This structure is used for the management of descriptors.  It may be
  * shared by multiple processes.
@@ -84,6 +83,8 @@
 #define NDFILE		25		/* 125 bytes */
 #define NDEXTENT	50		/* 250 bytes in 256-byte alloc. */ 
 
+#ifdef BSD_KERNEL_PRIVATE
+
 struct klist;
 
 struct filedesc {
@@ -92,10 +93,10 @@ struct filedesc {
 	struct	vnode *fd_cdir;		/* current directory */
 	struct	vnode *fd_rdir;		/* root directory */
 	int	fd_nfiles;		/* number of open files allocated */
-	u_short	fd_lastfile;		/* high-water mark of fd_ofiles */
-	u_short	fd_freefile;		/* approx. next free file */
+	int	fd_lastfile;		/* high-water mark of fd_ofiles */
+	int	fd_freefile;		/* approx. next free file */
 	u_short	fd_cmask;		/* mask for file creation */
-	u_short	fd_refcnt;		/* reference count */
+	uint32_t	fd_refcnt;		/* reference count */
 
 	int     fd_knlistsize;          /* size of knlist */
 	struct  klist *fd_knlist;       /* list of attached knotes */
@@ -118,6 +119,11 @@ struct filedesc {
 #define UF_RESERVED	0x04		/* open pending / in progress */
 #define UF_CLOSING	0x08		/* close in progress */
 
+#ifdef KERNEL
+#define UF_RESVWAIT	0x10		/* close in progress */
+#define UF_VALID_FLAGS	(UF_EXCLOSE| UF_RESERVED | UF_CLOSING | UF_RESVWAIT)
+#endif /* KERNEL */
+
 /*
  * Storage required per open file descriptor.
  */
@@ -129,25 +135,24 @@ struct filedesc {
  */
 extern int	dupfdopen(struct filedesc *fdp,
 				int indx, int dfd, int mode, int error);
-extern int	fdalloc(struct proc *p, int want, int *result);
-extern void	fdrelse(struct proc *p, int fd);
-extern int	fdavail(struct proc *p, int n);
+extern int	fdalloc(proc_t p, int want, int *result);
+extern void	fdrelse(proc_t p, int fd);
+extern int	fdavail(proc_t p, int n);
 #define		fdfile(p, fd)					\
 			(&(p)->p_fd->fd_ofiles[(fd)])
 #define		fdflags(p, fd)					\
 			(&(p)->p_fd->fd_ofileflags[(fd)])
-extern int	falloc(struct proc *p,
-				struct fileproc **resultfp, int *resultfd);
+extern int	falloc(proc_t p, struct fileproc **resultfp, int *resultfd, vfs_context_t ctx);
 extern void	ffree(struct file *fp);
 
 #ifdef __APPLE_API_PRIVATE
-extern struct	filedesc *fdcopy(struct proc *p);
-extern void	fdfree(struct proc *p);
-extern void	fdexec(struct proc *p);
+extern struct	filedesc *fdcopy(proc_t p, struct vnode *uth_cdir);
+extern void	fdfree(proc_t p);
+extern void	fdexec(proc_t p);
 #endif /* __APPLE_API_PRIVATE */
 
 #endif /* KERNEL */
 
-#endif /* __APPLE_API_UNSTABLE */
+#endif /* BSD_KERNEL_PRIVATE */
 
 #endif /* !_SYS_FILEDESC_H_ */