[Libsysio-commit] HEAD: libsysio/include inode.h

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10818/include

Modified Files:
	inode.h 
Log Message:


The public include xtio.h was mostly unneeded, except for the definition
of ioid_t.

For the internals, we are converted to using the address of the IO context
record as the identifier. Removed, finally, xtio.h from everything not
involving the data path. Externally, of course, everything is the same.


Index: inode.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/inode.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -b -B -p -r1.20 -r1.21
--- inode.h	26 Jul 2004 16:38:01 -0000	1.20
+++ inode.h	27 Jul 2004 15:00:41 -0000	1.21
@@ -370,7 +370,6 @@ struct ioctx {
         ioctx_fast                      : 1,		/* from stack space */
 	ioctx_done			: 1,		/* transfer complete */
 	ioctx_write			: 1;		/* op is a write */
-    ioid_t  ioctx_id;                                   /* unique ident */
     struct inode *ioctx_ino;                            /* i-node */
     const struct iovec *ioctx_iov;                      /* scatter/gather vec */
     size_t  ioctx_iovlen;                               /* iovec length */
@@ -385,12 +384,11 @@ struct ioctx {
 /*
  * Init IO context record.
  */
-#define IOCTX_INIT(ioctx, fast, id, wr, ino, iov, iovlen, xtv, xtvlen) \
+#define IOCTX_INIT(ioctx, fast, wr, ino, iov, iovlen, xtv, xtvlen) \
     do { \
 	(ioctx)->ioctx_fast = (fast); \
 	(ioctx)->ioctx_done = 0; \
 	(ioctx)->ioctx_write = (wr) ? 1 : 0; \
-        (ioctx)->ioctx_id = (id); \
         (ioctx)->ioctx_ino = (ino); \
         (ioctx)->ioctx_iov = (iov); \
         (ioctx)->ioctx_iovlen = (iovlen); \
@@ -486,7 +484,7 @@ extern int _sysio_ioctx_cb(struct ioctx 
 			   void (*f)(struct ioctx *, void *),
 			   void *data);
 extern void _sysio_ioctx_cb_free(struct ioctx_callback *cb);
-extern struct ioctx *_sysio_ioctx_find(ioid_t id);
+extern struct ioctx *_sysio_ioctx_find(void *id);
 extern ssize_t _sysio_ioctx_wait(struct ioctx *ioctx);
 extern void _sysio_ioctx_complete(struct ioctx *ioctx);
 extern ssize_t _sysio_validx(const struct intnl_xtvec *xtv, size_t xtvlen,