Update of /cvsroot/libsysio/libsysio/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25646/src
Modified Files:
fcntl.c init.c module.mk namei.c open.c
Removed Files:
file_hack.c stdlib.c
Log Message:
Removing obsolete code related to cplant yod, lustre hack, and sockets driver.
Index: fcntl.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/fcntl.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -w -b -B -p -r1.31 -r1.32
--- fcntl.c 17 Jun 2008 17:18:57 -0000 1.31
+++ fcntl.c 15 Oct 2008 22:01:01 -0000 1.32
@@ -57,22 +57,6 @@
#include "sysio-symbols.h"
-#ifdef HAVE_LUSTRE_HACK
-#include <syscall.h>
-#include <native.h>
-#endif
-
-#ifdef HAVE_LUSTRE_HACK
-static int
-_sysio_lustre_fcntl(int fd, int cmd, va_list ap, int *rtn)
-{
- long arg = va_arg(ap, long);
-
- *rtn = syscall(SYSIO_SYS_fcntl, fd, cmd, arg);
- return *rtn == -1 ? -errno : 0;
-}
-#endif
-
static int
_sysio_fcntl_raw_call(struct pnode *pno, int *r, int cmd, ...)
{
@@ -165,14 +149,9 @@ _sysio_vfcntl(int fd, int cmd, va_list a
err = 0;
fil = _sysio_fd_find(fd);
if (!fil) {
-#ifdef HAVE_LUSTRE_HACK
- err = _sysio_lustre_fcntl(fd, cmd, ap, &rtn);
- goto out;
-#else
rtn = -1;
err = -EBADF;
goto out;
-#endif
}
switch (cmd) {
Index: init.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/init.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -w -b -B -p -r1.41 -r1.42
--- init.c 17 Jun 2008 17:18:57 -0000 1.41
+++ init.c 15 Oct 2008 22:01:01 -0000 1.42
@@ -192,9 +192,6 @@ int
_sysio_init()
{
int err;
-#ifdef WITH_SOCKETS
- extern int _sysio_sockets_init(void);
-#endif
mutex_init(&_sysio_biglock, MUTEX_RECURSIVE);
@@ -234,11 +231,6 @@ _sysio_init()
if (err)
goto error;
#endif
-#ifdef WITH_SOCKETS
- err = _sysio_sockets_init();
- if (err)
- goto error;
-#endif
goto out;
error:
Index: module.mk
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/module.mk,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -b -B -p -r1.17 -r1.18
--- module.mk 17 Jun 2008 17:18:57 -0000 1.17
+++ module.mk 15 Oct 2008 22:01:01 -0000 1.18
@@ -10,17 +10,7 @@ else
TRACING_SRCS =
endif
-if WITH_LUSTRE_HACK
-FILE_SUPPORT = src/file_hack.c
-else
FILE_SUPPORT = src/file.c
-endif
-
-if WITH_LUSTRE_HACK
-LUSTRE_SRCDIR_SRCS = src/stdlib.c
-else
-LUSTRE_SRCDIR_SRCS =
-endif
if WITH_STATVFS
STATVFS_SRCS = src/statvfs.c
@@ -40,7 +30,6 @@ SRCDIR_SRCS = src/access.c src/chdir.c s
src/stddir.c src/readdir.c src/readdir64.c \
src/symlink.c src/readlink.c \
src/truncate.c src/unlink.c src/utime.c \
- $(FILE_SUPPORT) $(LUSTRE_SRCDIR_SRCS) \
- $(TRACING_SRCS) src/cprintf.c src/tree.c
+ $(FILE_SUPPORT) $(TRACING_SRCS) src/cprintf.c src/tree.c
SRCDIR_EXTRA = src/module.mk
Index: namei.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/namei.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -b -B -p -r1.30 -r1.31
--- namei.c 17 Jun 2008 17:18:57 -0000 1.30
+++ namei.c 15 Oct 2008 22:01:01 -0000 1.31
@@ -531,17 +531,6 @@ _sysio_path_walk(struct pnode *parent, s
return err;
}
-#ifdef CPLANT_YOD
-/*
- * for backward compatibility w/protocol switch
- * remove everything up to the first ':'
- * fortran libs prepend cwd to path, so not much choice
- */
-#define STRIP_PREFIX(p) strchr(p,':') ? strchr(p,':')+1 : p
-#else
-#define STRIP_PREFIX(p) p
-#endif
-
/*
* Expanded form of the path-walk routine, with the common arguments, builds
* the nameidata bundle and calls path-walk.
@@ -556,7 +545,7 @@ _sysio_namei(struct pnode *parent,
struct nameidata nameidata;
int err;
- ND_INIT(&nameidata, flags, STRIP_PREFIX(path), _sysio_root, intnt);
+ ND_INIT(&nameidata, flags, path, _sysio_root, intnt);
err = _sysio_path_walk(parent, &nameidata);
if (!err)
*pnop = nameidata.nd_pno;
Index: open.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/open.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -w -b -B -p -r1.32 -r1.33
--- open.c 17 Jun 2008 17:18:57 -0000 1.32
+++ open.c 15 Oct 2008 22:01:01 -0000 1.33
@@ -260,13 +260,8 @@ SYSIO_INTERFACE_NAME(creat)(const char *
sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(creat),
PREPEND(__, SYSIO_INTERFACE_NAME(creat)))
#undef creat64
-#ifndef HAVE_LUSTRE_HACK
sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(creat), SYSIO_INTERFACE_NAME(creat64))
-#else
-/* XXX workaround SuSE SLES 8, glibc-2.2.5 */
-sysio_sym_strong_alias(SYSIO_INTERFACE_NAME(creat),
- SYSIO_INTERFACE_NAME(creat64))
-#endif
+
#undef __creat64
sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(creat),
PREPEND(__, SYSIO_INTERFACE_NAME(creat64)))
--- file_hack.c DELETED ---
--- stdlib.c DELETED ---
|
