[Libsysio-commit] b_lustre: libsysio/drivers/sockets sockets.c

[Mei <me...@us...>]

Update of /cvsroot/libsysio/libsysio/drivers/sockets
In directory sc8-pr-cvs1:/tmp/cvs-serv28091/drivers/sockets

Modified Files:
      Tag: b_lustre
	sockets.c 
Log Message:
merge HEAD into b_lustre, some fixes



Index: sockets.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/drivers/sockets/Attic/sockets.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -b -B -p -r1.1.2.1 -r1.1.2.2
--- sockets.c	8 Sep 2003 03:52:28 -0000	1.1.2.1
+++ sockets.c	1 Nov 2003 03:08:21 -0000	1.1.2.2
@@ -90,11 +90,9 @@ struct socket_info {
 
 static int sockets_inop_close(struct inode *ino);
 static int sockets_inop_ipreadv(struct inode *ino,
-			       struct io_arguments *ioargs,
-			       struct ioctx **ioctxp);
+			        struct ioctx *ioctx);
 static int sockets_inop_ipwritev(struct inode *ino,
-			        struct io_arguments *ioargs,
-				struct ioctx **ioctxp);
+				 struct ioctx *ioctxp);
 static int sockets_inop_iodone(struct ioctx *ioctx);
 static int sockets_inop_sync(struct inode *ino);
 static int sockets_inop_datasync(struct inode *ino);
@@ -168,25 +166,16 @@ sockets_inop_close(struct inode *ino)
 static int
 doio(ssize_t (*f)(int, const struct iovec *, int),
      struct inode *ino,
-     struct io_arguments *ioargs,
-     struct ioctx **ioctxp)
+     struct ioctx *ioctx)
 {
 	struct socket_info *ski = I2SKI(ino);
-	struct ioctx *ioctx;
 
 	assert(ski->ski_fd >= 0);
 
-	if (ioargs->ioarg_iovlen && (int )ioargs->ioarg_iovlen < 0)
+	if (ioctx->ioctx_iovlen && (int) ioctx->ioctx_iovlen < 0)
 		return -EINVAL;
 
 	/*
-	 * Get a new IO context.
-	 */
-	ioctx = _sysio_ioctx_new(ino, ioargs);
-	if (!ioctx)
-		return -ENOMEM;
-
-	/*
 	 * Call the appropriate (read/write) IO function to
 	 * transfer the data now.
 	 */
@@ -195,7 +184,7 @@ doio(ssize_t (*f)(int, const struct iove
 	if (ioctx->ioctx_cc < 0)
 		ioctx->ioctx_errno = errno;
 
-	*ioctxp = ioctx;
+	ioctx->ioctx_done = 1;
 	return 0;
 }
 
@@ -211,11 +200,10 @@ _readv(int fd, const struct iovec *vecto
 
 static int
 sockets_inop_ipreadv(struct inode *ino,
-		    struct io_arguments *ioargs,
-		    struct ioctx **ioctxp)
+		     struct ioctx *ioctx)
 {
 
-	return doio(_readv, ino, ioargs, ioctxp);
+	return doio(_readv, ino, ioctx);
 }
 
 /*
@@ -230,11 +218,10 @@ _writev(int fd, const struct iovec *vect
 
 static int
 sockets_inop_ipwritev(struct inode *ino,
-		     struct io_arguments *ioargs,
-		     struct ioctx **ioctxp)
+		      struct ioctx *ioctx)
 {
 
-	return doio(_writev, ino, ioargs, ioctxp);
+	return doio(_writev, ino, ioctx);
 }
 
 static int
@@ -319,7 +306,6 @@ _sysio_sockets_inew()
 
 	ino =
 	    _sysio_i_new(sockets_fs,
-			 ski->ski_ident.inum,
 			 &ski->ski_fileid,
 			 0,
 			 0,