[Libsysio-commit] b_lustre: libsysio/src chdir.c dup.c fcntl.c ioctl.c lseek.c open.c read.c stat.c stat64.c write.c

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

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

Modified Files:
      Tag: b_lustre
	chdir.c dup.c fcntl.c ioctl.c lseek.c open.c read.c stat.c 
	stat64.c write.c 
Log Message:
don't intercept non-standard calls such as __xxxx. Probably Catamount
need it but currently can't works with liblustre on linux. We can't
add them back later if testing show we really need it.



Index: chdir.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/chdir.c,v
retrieving revision 1.3.8.4
retrieving revision 1.3.8.5
diff -u -w -b -B -p -r1.3.8.4 -r1.3.8.5
--- chdir.c	1 Nov 2003 03:08:22 -0000	1.3.8.4
+++ chdir.c	4 Dec 2003 04:39:17 -0000	1.3.8.5
@@ -236,10 +236,6 @@ getcwd(char *buf, size_t size)
 	return buf;
 }
 
-#ifdef __GLIBC__
-sysio_sym_weak_alias(getcwd, __getcwd)
-#endif
-
 #ifdef PATH_MAX
 char    *
 getwd(char *buf)

Index: dup.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/dup.c,v
retrieving revision 1.1.1.1.12.2
retrieving revision 1.1.1.1.12.3
diff -u -w -b -B -p -r1.1.1.1.12.2 -r1.1.1.1.12.3
--- dup.c	1 Nov 2003 03:08:22 -0000	1.1.1.1.12.2
+++ dup.c	4 Dec 2003 04:39:17 -0000	1.1.1.1.12.3
@@ -86,8 +86,3 @@ dup(int oldfd)
 	return rc;
 }
 
-#ifdef __GLIBC__
-#undef __dup
-sysio_sym_weak_alias(dup, __dup)
-#endif
-

Index: fcntl.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/fcntl.c,v
retrieving revision 1.3.2.8
retrieving revision 1.3.2.9
diff -u -w -b -B -p -r1.3.2.8 -r1.3.2.9
--- fcntl.c	1 Nov 2003 03:38:28 -0000	1.3.2.8
+++ fcntl.c	4 Dec 2003 04:39:17 -0000	1.3.2.9
@@ -142,11 +142,6 @@ out:
 	return err;
 }
 
-#ifdef __GLIBC__
-#undef __fcntl
-sysio_sym_weak_alias(fcntl, __fcntl)
-#endif
-
 #if defined(BSD) || defined(REDSTORM)
 #undef _fcntl
 sysio_sym_weak_alias(fcntl, _fcntl)

Index: ioctl.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/ioctl.c,v
retrieving revision 1.1.1.1.12.4
retrieving revision 1.1.1.1.12.5
diff -u -w -b -B -p -r1.1.1.1.12.4 -r1.1.1.1.12.5
--- ioctl.c	1 Nov 2003 03:08:22 -0000	1.1.1.1.12.4
+++ ioctl.c	4 Dec 2003 04:39:17 -0000	1.1.1.1.12.5
@@ -86,11 +86,6 @@ out:
 }
 
 
-#ifdef __GLIBC__
-#undef __ioctl
-sysio_sym_weak_alias(ioctl, __ioctl)
-#endif
-
 #if defined(BSD) || defined(REDSTORM)
 #undef _ioctl
 sysio_sym_weak_alias(ioctl, _ioctl)

Index: lseek.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/lseek.c,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -w -b -B -p -r1.4.2.4 -r1.4.2.5
--- lseek.c	1 Nov 2003 03:08:22 -0000	1.4.2.4
+++ lseek.c	4 Dec 2003 04:39:17 -0000	1.4.2.5
@@ -106,10 +106,6 @@ out:
 #if _LARGEFILE64_SOURCE
 #undef lseek64
 sysio_sym_weak_alias(_sysio_lseek, lseek64)
-#ifdef __GLIBC__
-#undef __lseek64
-sysio_sym_weak_alias(_sysio_lseek, __lseek64)
-#endif
 #endif
 
 #undef lseek
@@ -135,11 +131,6 @@ lseek(int fd, off_t offset, int whence)
 	SYSIO_LEAVE;
 	return rtn;
 }
-
-#ifdef __GLIBC__
-#undef __lseek
-sysio_sym_weak_alias(lseek, __lseek)
-#endif
 
 #if 0
 #ifdef __linux__

Index: open.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/open.c,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -w -b -B -p -r1.7.2.5 -r1.7.2.6
--- open.c	1 Nov 2003 03:08:22 -0000	1.7.2.5
+++ open.c	4 Dec 2003 04:39:17 -0000	1.7.2.6
@@ -212,12 +212,8 @@ error:
 }
 
 #ifdef __GLIBC__
-#undef __open
-sysio_sym_weak_alias(open, __open)
 #undef open64
 sysio_sym_weak_alias(open, open64)
-#undef __open64
-sysio_sym_weak_alias(open, __open64)
 #endif
 
 #if defined(BSD) || defined(REDSTORM)
@@ -238,11 +234,6 @@ close(int fd)
 	return err ? -1 : 0;
 }
 
-#ifdef __GLIBC__
-#undef __close
-sysio_sym_weak_alias(close, __close)
-#endif
-
 #if defined(BSD) || defined(REDSTORM)
 #undef _close
 sysio_sym_weak_alias(close, _close)
@@ -256,12 +247,8 @@ creat(const char *path, mode_t mode)
 }
 
 #ifdef __GLIBC__
-#undef __creat
-sysio_sym_weak_alias(creat, __creat)
 #undef creat64
 sysio_sym_weak_alias(creat, creat64)
-#undef __creat64
-sysio_sym_weak_alias(creat, __creat64)
 #endif
 
 #if defined(BSD) || defined(REDSTORM)

Index: read.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/read.c,v
retrieving revision 1.2.8.8
retrieving revision 1.2.8.9
diff -u -w -b -B -p -r1.2.8.8 -r1.2.8.9
--- read.c	1 Nov 2003 03:08:22 -0000	1.2.8.8
+++ read.c	4 Dec 2003 04:39:17 -0000	1.2.8.9
@@ -257,11 +257,6 @@ read(int fd, void *buf, size_t count)
 	return iowait(ioid);
 }
 
-#ifdef __GLIBC__
-#undef __read
-sysio_sym_weak_alias(read, __read)
-#endif
-
 #if defined(BSD) || defined(REDSTORM)
 #undef _read
 sysio_sym_weak_alias(read, _read)

Index: stat.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/stat.c,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -w -b -B -p -r1.3.4.2 -r1.3.4.3
--- stat.c	1 Nov 2003 03:08:22 -0000	1.3.4.2
+++ stat.c	4 Dec 2003 04:39:17 -0000	1.3.4.3
@@ -87,8 +87,8 @@ convstat(struct stat64 *st64_buf, struct
 }
 #endif
 
-int
-__fxstat(int __ver, int __fildes, struct stat *__stat_buf)
+static int
+__fxstat_internal(int __ver, int __fildes, struct stat *__stat_buf)
 {
 	struct file *fil;
 	int	err;
@@ -132,7 +132,7 @@ __fstat(int fd, struct stat *buf)
 	int rc;
 	SYSIO_ENTER;
 
-	rc = __fxstat(_STAT_VER, fd, buf);
+	rc = __fxstat_internal(_STAT_VER, fd, buf);
 
 	SYSIO_LEAVE;
 	return rc;

Index: stat64.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/stat64.c,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -w -b -B -p -r1.3.4.2 -r1.3.4.3
--- stat64.c	1 Nov 2003 03:08:22 -0000	1.3.4.2
+++ stat64.c	4 Dec 2003 04:39:17 -0000	1.3.4.3
@@ -62,8 +62,8 @@
 #undef __xstat64
 #undef __lxstat64
 
-int
-__fxstat64(int __ver, int __fildes, struct stat64 *__stat_buf)
+static int
+__fxstat64_internal(int __ver, int __fildes, struct stat64 *__stat_buf)
 {
 	struct file *fil;
 	int	err;
@@ -94,7 +94,7 @@ fstat64(int fd, struct stat64 *buf)
 	int rc;
 	SYSIO_ENTER;
 
-	rc = __fxstat64(_STAT_VER, fd, buf);
+	rc = __fxstat64_internal(_STAT_VER, fd, buf);
 
 	SYSIO_LEAVE;
 	return rc;

Index: write.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/write.c,v
retrieving revision 1.2.10.8
retrieving revision 1.2.10.9
diff -u -w -b -B -p -r1.2.10.8 -r1.2.10.9
--- write.c	1 Nov 2003 03:08:23 -0000	1.2.10.8
+++ write.c	4 Dec 2003 04:39:17 -0000	1.2.10.9
@@ -255,11 +255,6 @@ write(int fd, const void *buf, size_t co
 	return iowait(ioid);
 }
 
-#ifdef __GLIBC__
-#undef __write
-sysio_sym_weak_alias(write, __write)
-#endif
-
 #if defined(BSD) || defined(REDSTORM)
 #undef _write
 sysio_sym_weak_alias(write, _write)