[Libsysio-commit] b_lustre: libsysio/src Makefile.am fcntl.c iowait.c bypass.c

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

Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1:/tmp/cvs-serv20631/src

Modified Files:
      Tag: b_lustre
	Makefile.am fcntl.c iowait.c 
Removed Files:
      Tag: b_lustre
	bypass.c 
Log Message:
remove bypass.c/bypass.h, integrate some of remains bypass code into
each .c files.



Index: Makefile.am
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/Makefile.am,v
retrieving revision 1.5.4.5
retrieving revision 1.5.4.6
diff -u -w -b -B -p -r1.5.4.5 -r1.5.4.6
--- Makefile.am	4 Dec 2003 04:33:46 -0000	1.5.4.5
+++ Makefile.am	12 Dec 2003 06:05:25 -0000	1.5.4.6
@@ -1,20 +1,11 @@
 lib_LIBRARIES = libsysio.a
 
-if CYGWIN
 libsysio_a_SOURCES = chdir.c chmod.c chown.c dev.c dup.c fcntl.c file.c fs.c \
 	fsync.c init.c inode.c ioctl.c ioctx.c iowait.c \
 	link.c lseek.c mkdir.c mknod.c mount.c namei.c open.c read.c rename.c \
 	rmdir.c stat.c stat64.c statvfs.c statvfs64.c symlink.c truncate.c \
 	unlink.c \
 	utime.c write.c access.c
-else
-libsysio_a_SOURCES = chdir.c chmod.c chown.c dev.c dup.c fcntl.c file.c fs.c \
-	fsync.c getdirentries.c init.c inode.c ioctl.c ioctx.c iowait.c \
-	link.c lseek.c mkdir.c mknod.c mount.c namei.c open.c read.c rename.c \
-	rmdir.c stat.c stat64.c statvfs.c statvfs64.c symlink.c truncate.c \
-	unlink.c \
-	utime.c write.c access.c bypass.c
-endif
 
 libsysio_a_CFLAGS = -fPIC
 

Index: fcntl.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/fcntl.c,v
retrieving revision 1.3.2.9
retrieving revision 1.3.2.10
diff -u -w -b -B -p -r1.3.2.9 -r1.3.2.10
--- fcntl.c	4 Dec 2003 04:39:17 -0000	1.3.2.9
+++ fcntl.c	12 Dec 2003 06:05:25 -0000	1.3.2.10
@@ -54,7 +54,6 @@
 #include "sysio.h"
 #include "inode.h"
 #include "file.h"
-#include "bypass.h"
 
 #include "sysio-symbols.h"
 
@@ -100,7 +99,7 @@ fcntl(int fd, int cmd, ...)
 	fil = _sysio_fd_find(fd);
 	if (!fil) {
 		va_start(ap, cmd);
-		err = __bypass_fcntl(fd, cmd, ap);
+		err = _sysio_fcntl_common(fd, cmd, ap);
 		va_end(ap);
 		SYSIO_LEAVE;
 		return err;

Index: iowait.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/iowait.c,v
retrieving revision 1.3.8.2
retrieving revision 1.3.8.3
diff -u -w -b -B -p -r1.3.8.2 -r1.3.8.3
--- iowait.c	1 Nov 2003 03:08:22 -0000	1.3.8.2
+++ iowait.c	12 Dec 2003 06:05:25 -0000	1.3.8.3
@@ -91,14 +91,6 @@ iowait(ioid_t ioid)
 	struct ioctx *ioctx;
 	ssize_t	cc;
 
-	/* check if it's a bypassed ioctx */
-	ioctx = (struct ioctx *)ioid;
-	if (ioctx->ioctx_id == 0) {
-		cc = ioctx->ioctx_cc;
-		free(ioctx);
-		return cc;
-	}
-
 	ioctx = lookup_ioid(ioid);
 	if (!ioctx) {
 		return -1;

--- bypass.c DELETED ---