rm user.h, OFILE

[unix-history] / usr / src / sys / kern / uipc_usrreq.c

diff --git a/usr/src/sys/kern/uipc_usrreq.c b/usr/src/sys/kern/uipc_usrreq.c
index fbc406d..280ed80 100644 (file)
--- a/usr/src/sys/kern/uipc_usrreq.c
+++ b/usr/src/sys/kern/uipc_usrreq.c
@@ -6,7 +6,6 @@
  */
 
 #include "param.h"
  */
 
 #include "param.h"

-#include "user.h"

 #include "proc.h"
 #include "filedesc.h"
 #include "domain.h"
 #include "proc.h"
 #include "filedesc.h"
 #include "domain.h"


@@ -572,7 +571,7 @@ unp_externalize(rights)
                if (fdalloc(p, 0, &f))
                        panic("unp_externalize");
                fp = *rp;
                if (fdalloc(p, 0, &f))
                        panic("unp_externalize");
                fp = *rp;

-               OFILE(p->p_fd, f) = fp;
+               p->p_fd->fd_ofiles[f] = fp;

                fp->f_msgcount--;
                unp_rights--;
                *(int *)rp++ = f;
                fp->f_msgcount--;
                unp_rights--;
                *(int *)rp++ = f;


@@ -597,12 +596,13 @@ unp_internalize(control)
        rp = (struct file **)(cm + 1);
        for (i = 0; i < oldfds; i++) {
                fd = *(int *)rp++;
        rp = (struct file **)(cm + 1);
        for (i = 0; i < oldfds; i++) {
                fd = *(int *)rp++;

-               if ((unsigned)fd >= fdp->fd_nfiles || OFILE(fdp, fd) == NULL)
+               if ((unsigned)fd >= fdp->fd_nfiles ||
+                   fdp->fd_ofiles[fd] == NULL)

                        return (EBADF);
        }
        rp = (struct file **)(cm + 1);
        for (i = 0; i < oldfds; i++) {
                        return (EBADF);
        }
        rp = (struct file **)(cm + 1);
        for (i = 0; i < oldfds; i++) {

-               fp = OFILE(fdp, *(int *)rp);
+               fp = fdp->fd_ofiles[*(int *)rp];

                *rp++ = fp;
                fp->f_count++;
                fp->f_msgcount++;
                *rp++ = fp;
                fp->f_count++;
                fp->f_msgcount++;