xnu-1228.tar.gz

[apple/xnu.git] / bsd / sys / filedesc.h

diff --git a/bsd/sys/filedesc.h b/bsd/sys/filedesc.h
index 816b411ca23f34f5a151e59a055f5db00c6204a4..b9839f3e96eccd40354d772cf7698df243f2eed3 100644 (file)
--- a/bsd/sys/filedesc.h
+++ b/bsd/sys/filedesc.h
@@ -92,10 +92,10 @@ struct filedesc {
        struct  vnode *fd_cdir;         /* current directory */
        struct  vnode *fd_rdir;         /* root directory */
        int     fd_nfiles;              /* number of open files allocated */
        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_cmask;               /* mask for file creation */

-       u_short fd_refcnt;              /* reference count */
+       u_long  fd_refcnt;              /* reference count */

 
        int     fd_knlistsize;          /* size of knlist */
        struct  klist *fd_knlist;       /* list of attached knotes */
 
        int     fd_knlistsize;          /* size of knlist */
        struct  klist *fd_knlist;       /* list of attached knotes */


@@ -118,6 +118,11 @@ struct filedesc {
 #define UF_RESERVED    0x04            /* open pending / in progress */
 #define UF_CLOSING     0x08            /* close in progress */
 
 #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.
  */
 /*
  * Storage required per open file descriptor.
  */


@@ -129,21 +134,20 @@ struct filedesc {
  */
 extern int     dupfdopen(struct filedesc *fdp,
                                int indx, int dfd, int mode, int error);
  */
 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)])
 #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 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_PRIVATE */
 
 #endif /* KERNEL */