[Libsysio-commit] cplant: libsysio/dev/stdfd stdfd.c

[Ruth K. <rk...@us...>]

Update of /cvsroot/libsysio/libsysio/dev/stdfd
In directory sc8-pr-cvs1:/tmp/cvs-serv28674/dev/stdfd

Modified Files:
      Tag: cplant
	stdfd.c 
Log Message:
Merge HEAD changes into cplant branch

Index: stdfd.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/dev/stdfd/stdfd.c,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -w -b -B -p -r1.4 -r1.4.2.1
--- stdfd.c	14 Aug 2003 18:39:33 -0000	1.4
+++ stdfd.c	14 Oct 2003 23:39:36 -0000	1.4.2.1
@@ -58,6 +58,10 @@
 
 #include "stdfd.h"
 
+#ifdef REDSTORM
+#include <catamount/syscall.h>				/* ! in sys include? */
+#endif
+
 #ifdef CPLANT_YOD
 #include <sys/statfs.h>
 #include "cplant-yod.h"
@@ -75,11 +79,9 @@
 static int stdfd_open(struct pnode *pno, int flags, mode_t mode);
 static int stdfd_close(struct inode *ino);
 static int stdfd_ipreadv(struct inode *ino,
-			 struct io_arguments *ioargs,
-			 struct ioctx **ioctxp);
+			 struct ioctx *ioctx);
 static int stdfd_ipwritev(struct inode *ino,
-			  struct io_arguments *ioargs,
-			  struct ioctx **ioctxp);
+			  struct ioctx *ioctx);
 static int stdfd_iodone(struct ioctx *ioctx);
 static int stdfd_datasync(struct inode *ino);
 static int stdfd_ioctl(struct inode *ino,
@@ -124,18 +126,12 @@ stdfd_close(struct inode *ino __IS_UNUSE
 static int
 doio(ssize_t (*f)(int, char *, size_t),
      struct inode *ino,
-     struct io_arguments *ioargs,
-     struct ioctx **ioctxp)
+     struct ioctx *ioctx)
 {
-	struct ioctx *ioctx;
 	const struct iovec *iov;
 	size_t	n;
 	ssize_t	cc = 0;
 
-	ioctx = _sysio_ioctx_new(ino, ioargs);
-	if (!ioctx)
-		return -ENOMEM;
-
 	iov = ioctx->ioctx_iovec;
 	for (n = ioctx->ioctx_iovlen, iov = ioctx->ioctx_iovec;
 	     n--;
@@ -155,7 +151,6 @@ doio(ssize_t (*f)(int, char *, size_t),
 		ioctx->ioctx_errno = -cc;
 	}
 
-	*ioctxp = ioctx;
 	return 0;
 }
 
@@ -168,11 +163,10 @@ stdfd_read(int fd, char *buf, size_t nby
 
 static int
 stdfd_ipreadv(struct inode *ino,
-	      struct io_arguments *ioargs,
-	      struct ioctx **ioctxp)
+	      struct ioctx *ioctx)
 {
 
-	return doio(stdfd_read, ino, ioargs, ioctxp);
+	return doio(stdfd_read, ino, ioctx);
 }
 
 static ssize_t
@@ -186,14 +180,12 @@ stdfd_write(int fd,
 
 static int
 stdfd_ipwritev(struct inode *ino,
-	       struct io_arguments *ioargs,
-	       struct ioctx **ioctxp)
+	       struct ioctx *ioctx)
 {
 
 	return doio((ssize_t (*)(int, char *, size_t))stdfd_write,
 		    ino,
-		    ioargs,
-		    ioctxp);
+		    ioctx);
 }
 
 static int