Merge

1 files changed, 15 insertions, 15 deletions

diff --git a/sys/xfs/xfs_dev.h b/sys/xfs/xfs_dev.h
index 4531dfdb512..08cf5970c8d 100644
--- a/sys/xfs/xfs_dev.h
+++ b/sys/xfs/xfs_dev.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995 - 2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1995 - 2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: xfs_dev.h,v 1.6 2002/06/07 04:10:32 hin Exp $ */
+/* $arla: xfs_dev.h,v 1.19 2003/01/19 20:53:52 lha Exp $ */
 
 #ifndef _xfs_dev_h
 #define _xfs_dev_h
@@ -63,10 +63,10 @@ struct xfs_channel {
     int status;
 #define CHANNEL_OPENED	0x1
 #define CHANNEL_WAITING 0x2
-    struct proc *proc;
+    d_thread_t *proc;
 };
 
-extern struct xfs_channel xfs_channel[NXFS];
+extern struct xfs_channel xfs_channel[NNNPFS];
 
 /*
  * These are variant dependent
@@ -104,22 +104,22 @@ void
 xfs_outq(struct xfs_link *p);
 
 int
-xfs_devopen_common(dev_t dev, struct proc *);
+xfs_devopen_common(dev_t dev);
 
 #ifndef __osf__ /* XXX - we should do the same for osf */
-int xfs_devopen(dev_t dev, int flag, int devtype, struct proc *proc);
-int xfs_devclose(dev_t dev, int flag, int devtype, struct proc *proc);
+int xfs_devopen(dev_t dev, int flag, int devtype, d_thread_t *proc);
+int xfs_devclose(dev_t dev, int flag, int devtype, d_thread_t *proc);
 int xfs_devioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
-		 struct proc *p);
+		 d_thread_t *p);
 #ifdef HAVE_THREE_ARGUMENT_SELRECORD
-int xfs_devselect(dev_t dev, int which, void *wql, struct proc *p);
+int xfs_devselect(dev_t dev, int which, void *wql, d_thread_t *p);
 #else
-int xfs_devselect(dev_t dev, int which, struct proc *p);
+int xfs_devselect(dev_t dev, int which, d_thread_t *p);
 #endif
 #endif /* ! __osf__ */
 
 int
-xfs_devclose_common(dev_t dev, struct proc *p);
+xfs_devclose_common(dev_t dev, d_thread_t *p);
 
 int
 xfs_devread(dev_t dev, struct uio * uiop, int ioflag);
@@ -132,25 +132,25 @@ xfs_message_send(int fd, struct xfs_message_header * message, u_int size);
 
 int
 xfs_message_rpc(int fd, struct xfs_message_header * message, u_int size,
-		struct proc *p);
+		d_thread_t *p);
 
 int
 xfs_message_receive(int fd,
 		    struct xfs_message_header *message,
 		    u_int size,
-		    struct proc *p);
+		    d_thread_t *p);
 
 int
 xfs_message_wakeup(int fd,
 		   struct xfs_message_wakeup *message,
 		   u_int size,
-		   struct proc *p);
+		   d_thread_t *p);
 
 int
 xfs_message_wakeup_data(int fd,
 			struct xfs_message_wakeup_data * message,
 			u_int size,
-			struct proc *p);
+			d_thread_t *p);
 
 int
 xfs_uprintf_device(void);