--- src/sys/kern/uipc_usrreq.c	2005/04/20 19:43:53	1.21
+++ src/sys/kern/uipc_usrreq.c	2005/06/22 01:33:21	1.22
@@ -936,7 +936,7 @@ unp_externalize(struct mbuf *rights)
 			if (fdalloc(p, 0, &f))
 				panic("unp_externalize");
 			fp = *rp++;
-			p->p_fd->fd_ofiles[f] = fp;
+			p->p_fd->fd_files[f].fp = fp;
 			fp->f_msgcount--;
 			unp_rights--;
 			*fdp++ = f;
@@ -948,7 +948,7 @@ unp_externalize(struct mbuf *rights)
 			if (fdalloc(p, 0, &f))
 				panic("unp_externalize");
 			fp = *rp--;
-			p->p_fd->fd_ofiles[f] = fp;
+			p->p_fd->fd_files[f].fp = fp;
 			fp->f_msgcount--;
 			unp_rights--;
 			*fdp-- = f;
@@ -1018,9 +1018,9 @@ unp_internalize(struct mbuf *control, st
 	for (i = 0; i < oldfds; i++) {
 		fd = *fdp++;
 		if ((unsigned)fd >= fdescp->fd_nfiles ||
-		    fdescp->fd_ofiles[fd] == NULL)
+		    fdescp->fd_files[fd].fp == NULL)
 			return (EBADF);
-		if (fdescp->fd_ofiles[fd]->f_type == DTYPE_KQUEUE)
+		if (fdescp->fd_files[fd].fp->f_type == DTYPE_KQUEUE)
 			return (EOPNOTSUPP);
 	}
 	/*
@@ -1062,7 +1062,7 @@ unp_internalize(struct mbuf *control, st
 		fdp = (int *)(cm + 1) + oldfds - 1;
 		rp = (struct file **)CMSG_DATA(cm) + oldfds - 1;
 		for (i = 0; i < oldfds; i++) {
-			fp = fdescp->fd_ofiles[*fdp--];
+			fp = fdescp->fd_files[*fdp--].fp;
 			*rp-- = fp;
 			fp->f_count++;
 			fp->f_msgcount++;
@@ -1072,7 +1072,7 @@ unp_internalize(struct mbuf *control, st
 		fdp = (int *)(cm + 1);
 		rp = (struct file **)CMSG_DATA(cm);
 		for (i = 0; i < oldfds; i++) {
-			fp = fdescp->fd_ofiles[*fdp++];
+			fp = fdescp->fd_files[*fdp++].fp;
 			*rp++ = fp;
 			fp->f_count++;
 			fp->f_msgcount++;