[Libsysio-commit] strided-io: libsysio/drivers/incore fs_incore.c

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

Update of /cvsroot/libsysio/libsysio/drivers/incore
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4182/drivers/incore

Modified Files:
      Tag: strided-io
	fs_incore.c 
Log Message:


Gratuitous name change (sorry) from inop_ip{read,write}v to inop_{read,write}.


Index: fs_incore.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/drivers/incore/fs_incore.c,v
retrieving revision 1.11.6.1
retrieving revision 1.11.6.2
diff -u -w -b -B -p -r1.11.6.1 -r1.11.6.2
--- fs_incore.c	23 Jan 2004 15:18:53 -0000	1.11.6.1
+++ fs_incore.c	26 Jan 2004 07:24:29 -0000	1.11.6.2
@@ -142,10 +142,8 @@ static int _sysio_incore_inop_close(stru
 static int _sysio_incore_dirop_link(struct pnode *old, struct pnode *new);
 static int _sysio_incore_dirop_unlink(struct pnode *pno);
 static int _sysio_incore_dirop_rename(struct pnode *old, struct pnode *new);
-static int _sysio_incore_filop_ipreadv(struct inode *ino,
-				       struct ioctx *ioctx);
-static int _sysio_incore_filop_ipwritev(struct inode *ino,
-				        struct ioctx *ioctx);
+static int _sysio_incore_filop_read(struct inode *ino, struct ioctx *ioctx);
+static int _sysio_incore_filop_write(struct inode *ino, struct ioctx *ioctx);
 static int _sysio_incore_filop_iodone(struct ioctx *ioctx);
 static int _sysio_incore_filop_fcntl(struct inode *ino, int cmd, va_list ap);
 static int _sysio_incore_inop_sync(struct inode *ino);
@@ -168,10 +166,10 @@ static void _sysio_incore_illop(void);
 	(int (*)(struct pnode *, const char *))_sysio_incore_e_nosys
 #define _sysio_incore_dirop_readlink \
 	(int (*)(struct pnode *, char *, size_t))_sysio_incore_e_inval
-#define _sysio_incore_dirop_ipreadv \
+#define _sysio_incore_dirop_read \
 	(int (*)(struct inode *, \
 		 struct ioctx *))_sysio_incore_e_isdir
-#define _sysio_incore_dirop_ipwritev \
+#define _sysio_incore_dirop_write \
 	(int (*)(struct inode *, \
 		 struct ioctx *))_sysio_incore_e_isdir
 #define _sysio_incore_dirop_iodone \
@@ -197,8 +195,8 @@ static struct inode_ops _sysio_incore_di
 	_sysio_incore_dirop_link,
 	_sysio_incore_dirop_unlink,
 	_sysio_incore_dirop_rename,
-	_sysio_incore_dirop_ipreadv,
-	_sysio_incore_dirop_ipwritev,
+	_sysio_incore_dirop_read,
+	_sysio_incore_dirop_write,
 	_sysio_incore_dirop_iodone,
 	_sysio_incore_dirop_fcntl,
 	_sysio_incore_inop_sync,
@@ -252,8 +250,8 @@ static struct inode_ops _sysio_incore_fi
 	_sysio_incore_filop_link,
 	_sysio_incore_filop_unlink,
 	_sysio_incore_filop_rename,
-	_sysio_incore_filop_ipreadv,
-	_sysio_incore_filop_ipwritev,
+	_sysio_incore_filop_read,
+	_sysio_incore_filop_write,
 	_sysio_incore_filop_iodone,
 	_sysio_incore_filop_fcntl,
 	_sysio_incore_inop_sync,
@@ -280,8 +278,8 @@ static struct inode_ops _sysio_incore_de
 	_sysio_incore_filop_link,
 	_sysio_incore_filop_unlink,
 	_sysio_incore_filop_rename,
-	_sysio_nodev_inop_ipreadv,
-	_sysio_nodev_inop_ipwritev,
+	_sysio_nodev_inop_read,
+	_sysio_nodev_inop_write,
 	_sysio_nodev_inop_iodone,
 	_sysio_incore_filop_fcntl,
 	_sysio_incore_inop_sync,
@@ -1517,8 +1515,7 @@ incore_read(void *buf, size_t nbytes,
 }
 
 static int
-_sysio_incore_filop_ipreadv(struct inode *ino,
-			    struct ioctx *ioctx)
+_sysio_incore_filop_read(struct inode *ino, struct ioctx *ioctx)
 {
 	
 
@@ -1557,8 +1554,7 @@ incore_write(const void *buf, size_t nby
 }
 
 static int
-_sysio_incore_filop_ipwritev(struct inode *ino,
-			     struct ioctx *ioctx)
+_sysio_incore_filop_write(struct inode *ino, struct ioctx *ioctx)
 {
 
 	return doio((ssize_t (*)(void *, size_t,