[Libsysio-commit] b_lustre: libsysio/src Makefile.am chdir.c chmod.c chown.c dup.c fcntl.c fsync.c g
Brought to you by:
lward
Menu
▾
▴
[Libsysio-commit] b_lustre: libsysio/src Makefile.am chdir.c chmod.c chown.c dup.c fcntl.c fsync.c getdirentries.c init.c ioctl.c iowait.c lseek.c mkdir.c mknod.c open.c read.c rmdir.c stat.c stat64.c statvfs.c statvfs64.c symlink.c truncate.c unlink.c write.c
|
From: Mei <me...@us...> - 2003-12-15 08:22:20
|
Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1:/tmp/cvs-serv3191/src
Modified Files:
Tag: b_lustre
Makefile.am chdir.c chmod.c chown.c dup.c fcntl.c fsync.c
getdirentries.c init.c ioctl.c iowait.c lseek.c mkdir.c
mknod.c open.c read.c rmdir.c stat.c stat64.c statvfs.c
statvfs64.c symlink.c truncate.c unlink.c write.c
Log Message:
remove the enter/leave syscalls intercept, now liblustre don't need them.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/Makefile.am,v
retrieving revision 1.5.4.6
retrieving revision 1.5.4.7
diff -u -w -b -B -p -r1.5.4.6 -r1.5.4.7
--- Makefile.am 12 Dec 2003 06:05:25 -0000 1.5.4.6
+++ Makefile.am 15 Dec 2003 08:22:16 -0000 1.5.4.7
@@ -1,7 +1,7 @@
lib_LIBRARIES = libsysio.a
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 \
+ 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 \
Index: chdir.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/chdir.c,v
retrieving revision 1.3.8.5
retrieving revision 1.3.8.6
diff -u -w -b -B -p -r1.3.8.5 -r1.3.8.6
--- chdir.c 4 Dec 2003 04:39:17 -0000 1.3.8.5
+++ chdir.c 15 Dec 2003 08:22:16 -0000 1.3.8.6
@@ -119,18 +119,15 @@ chdir(const char *path)
{
int err;
struct pnode *pno;
- SYSIO_ENTER;
err = _sysio_namei(_sysio_cwd, path, 0, NULL, &pno);
if (err) {
errno = -err;
- SYSIO_LEAVE;
return -1;
}
err = _sysio_p_chdir(pno);
- SYSIO_LEAVE;
return err;
}
@@ -224,15 +221,12 @@ char *
getcwd(char *buf, size_t size)
{
int err;
- SYSIO_ENTER;
err = _sysio_p_path(_sysio_cwd, &buf, buf ? size : 0);
if (err) {
errno = -err;
- SYSIO_LEAVE;
return NULL;
}
- SYSIO_LEAVE;
return buf;
}
Index: chmod.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/chmod.c,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -u -w -b -B -p -r1.3.4.3 -r1.3.4.4
--- chmod.c 1 Nov 2003 03:08:22 -0000 1.3.4.3
+++ chmod.c 15 Dec 2003 08:22:16 -0000 1.3.4.4
@@ -72,7 +72,6 @@ chmod(const char *path, mode_t mode)
{
int err;
struct pnode *pno;
- SYSIO_ENTER;
err = _sysio_namei(_sysio_cwd, path, 0, NULL, &pno);
if (err)
@@ -84,7 +83,6 @@ out:
errno = -err;
err = -1;
}
- SYSIO_LEAVE;
return err;
}
Index: chown.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/chown.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
--- chown.c 1 Nov 2003 03:08:22 -0000 1.3.4.2
+++ chown.c 15 Dec 2003 08:22:16 -0000 1.3.4.3
@@ -59,7 +59,6 @@ _do_chown(struct pnode *pno, struct inod
int err;
struct intnl_stat stbuf;
unsigned mask;
- SYSIO_ENTER;
(void )memset(&stbuf, 0, sizeof(struct intnl_stat));
mask = 0;
@@ -92,7 +91,6 @@ out:
errno = -err;
err = -1;
}
- SYSIO_LEAVE;
return err;
}
Index: dup.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/dup.c,v
retrieving revision 1.1.1.1.12.3
retrieving revision 1.1.1.1.12.4
diff -u -w -b -B -p -r1.1.1.1.12.3 -r1.1.1.1.12.4
--- dup.c 4 Dec 2003 04:39:17 -0000 1.1.1.1.12.3
+++ dup.c 15 Dec 2003 08:22:16 -0000 1.1.1.1.12.4
@@ -54,35 +54,22 @@
int
dup2(int oldfd, int newfd)
{
- int rc;
- SYSIO_ENTER;
if (newfd < 0) {
errno = EBADF;
- SYSIO_LEAVE;
return -1;
}
- if (oldfd == newfd) {
- SYSIO_LEAVE;
+ if (oldfd == newfd)
return newfd;
- }
-
- rc = _sysio_fd_dup2(oldfd, newfd);
- SYSIO_LEAVE;
- return rc;
+ return _sysio_fd_dup2(oldfd, newfd);
}
int
dup(int oldfd)
{
- int rc;
- SYSIO_ENTER;
-
- rc = _sysio_fd_dup2(oldfd, -1);
- SYSIO_LEAVE;
- return rc;
+ return _sysio_fd_dup2(oldfd, -1);
}
Index: fcntl.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/fcntl.c,v
retrieving revision 1.3.2.10
retrieving revision 1.3.2.11
diff -u -w -b -B -p -r1.3.2.10 -r1.3.2.11
--- fcntl.c 12 Dec 2003 06:05:25 -0000 1.3.2.10
+++ fcntl.c 15 Dec 2003 08:22:16 -0000 1.3.2.11
@@ -66,8 +66,6 @@ int _sysio_fcntl_common(int fd, int cmd,
case F_GETFD:
case F_GETFL:
case F_GETOWN:
-// case F_GETSIG:
-// case F_GETLEASE:
return syscall(SYS_fcntl, fd, cmd);
case F_DUPFD:
case F_SETFD:
@@ -76,9 +74,6 @@ int _sysio_fcntl_common(int fd, int cmd,
case F_SETLK:
case F_SETLKW:
case F_SETOWN:
-// case F_SETSIG:
-// case F_SETLEASE:
-// case F_NOTIFY:
arg = va_arg(ap, long);
return syscall(SYS_fcntl, fd, cmd, arg);
}
@@ -93,7 +88,6 @@ fcntl(int fd, int cmd, ...)
int err;
struct file *fil;
va_list ap;
- SYSIO_ENTER;
err = 0;
fil = _sysio_fd_find(fd);
@@ -101,7 +95,6 @@ fcntl(int fd, int cmd, ...)
va_start(ap, cmd);
err = _sysio_fcntl_common(fd, cmd, ap);
va_end(ap);
- SYSIO_LEAVE;
return err;
}
@@ -110,7 +103,6 @@ fcntl(int fd, int cmd, ...)
case F_DUPFD:
{
long newfd;
- int rc;
va_start(ap, cmd);
newfd = va_arg(ap, long);
@@ -119,10 +111,7 @@ fcntl(int fd, int cmd, ...)
err = -EBADF;
goto out;
}
- rc = _sysio_fd_dup2(fd, (int )newfd);
-
- SYSIO_LEAVE;
- return rc;
+ return _sysio_fd_dup2(fd, (int )newfd);
}
break;
default:
@@ -137,7 +126,6 @@ out:
errno = -err;
err = -1;
}
- SYSIO_LEAVE;
return err;
}
Index: fsync.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/fsync.c,v
retrieving revision 1.2.8.1
retrieving revision 1.2.8.2
diff -u -w -b -B -p -r1.2.8.1 -r1.2.8.2
--- fsync.c 29 Jun 2003 10:15:32 -0000 1.2.8.1
+++ fsync.c 15 Dec 2003 08:22:16 -0000 1.2.8.2
@@ -55,22 +55,17 @@ fsync(int fd)
{
struct file *fil;
int err;
- SYSIO_ENTER;
fil = _sysio_fd_find(fd);
if (!(fil && fil->f_ino)) {
errno = -EBADF;
- SYSIO_LEAVE;
return -1;
}
err = (*fil->f_ino->i_ops.inop_sync)(fil->f_ino);
if (err) {
errno = -err;
- SYSIO_LEAVE;
return -1;
}
-
- SYSIO_LEAVE;
return 0;
}
@@ -79,21 +74,16 @@ fdatasync(int fd)
{
struct file *fil;
int err;
- SYSIO_ENTER;
fil = _sysio_fd_find(fd);
if (!(fil && fil->f_ino)) {
errno = -EBADF;
- SYSIO_LEAVE;
return -1;
}
err = (*fil->f_ino->i_ops.inop_datasync)(fil->f_ino);
if (err) {
errno = -err;
- SYSIO_LEAVE;
return -1;
}
-
- SYSIO_LEAVE;
return 0;
}
Index: getdirentries.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/getdirentries.c,v
retrieving revision 1.1.8.3
retrieving revision 1.1.8.4
diff -u -w -b -B -p -r1.1.8.3 -r1.1.8.4
--- getdirentries.c 1 Nov 2003 03:08:22 -0000 1.1.8.3
+++ getdirentries.c 15 Dec 2003 08:22:16 -0000 1.1.8.4
@@ -95,7 +96,6 @@ getdirentries(int fd,
size_t n;
size_t reclen;
char *cp;
- SYSIO_ENTER;
#define _dbaselen ((size_t )&((struct dirent *)0)->d_name[0])
#ifdef __GLIBC__
@@ -128,7 +128,6 @@ getdirentries(int fd,
ibuf = _fast_alloc(inbytes);
if (!ibuf) {
errno = ENOMEM;
- SYSIO_LEAVE;
return -1;
}
@@ -200,7 +199,6 @@ out:
if (dp == (struct dirent *)buf && cc < 0) {
errno = (int )-cc;
- SYSIO_LEAVE;
return -1;
}
cc = (char *)dp - buf;
@@ -211,7 +209,6 @@ out:
#else
off;
#endif
- SYSIO_LEAVE;
return cc;
#ifdef __GLIBC__
Index: init.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/init.c,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -u -w -b -B -p -r1.3.4.3 -r1.3.4.4
--- init.c 8 Sep 2003 03:52:28 -0000 1.3.4.3
+++ init.c 15 Dec 2003 08:22:16 -0000 1.3.4.4
@@ -56,9 +56,6 @@
#include "stdfd.h"
#endif
-int __sysio_in_syscall = 0;
-__sysio_hook_func *__sysio_hook_sys_enter = NULL;
-__sysio_hook_func *__sysio_hook_sys_leave = NULL;
/*
* Sysio library initialization. Must be called before anything else in the
* library.
Index: ioctl.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/ioctl.c,v
retrieving revision 1.1.1.1.12.5
retrieving revision 1.1.1.1.12.6
diff -u -w -b -B -p -r1.1.1.1.12.5 -r1.1.1.1.12.6
--- ioctl.c 4 Dec 2003 04:39:17 -0000 1.1.1.1.12.5
+++ ioctl.c 15 Dec 2003 08:22:16 -0000 1.1.1.1.12.6
@@ -63,7 +63,6 @@ ioctl(int fd, unsigned long request, ...
int err;
struct file *fil;
va_list ap;
- SYSIO_ENTER;
err = 0;
fil = _sysio_fd_find(fd);
@@ -81,7 +80,6 @@ out:
errno = -err;
err = -1;
}
- SYSIO_LEAVE;
return err;
}
Index: iowait.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/iowait.c,v
retrieving revision 1.3.8.3
retrieving revision 1.3.8.4
diff -u -w -b -B -p -r1.3.8.3 -r1.3.8.4
--- iowait.c 12 Dec 2003 06:05:25 -0000 1.3.8.3
+++ iowait.c 15 Dec 2003 08:22:16 -0000 1.3.8.4
@@ -92,9 +92,8 @@ iowait(ioid_t ioid)
ssize_t cc;
ioctx = lookup_ioid(ioid);
- if (!ioctx) {
+ if (!ioctx)
return -1;
- }
cc = _sysio_ioctx_wait(ioctx);
if (cc < 0) {
Index: lseek.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/lseek.c,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -w -b -B -p -r1.4.2.5 -r1.4.2.6
--- lseek.c 4 Dec 2003 04:39:17 -0000 1.4.2.5
+++ lseek.c 15 Dec 2003 08:22:16 -0000 1.4.2.6
@@ -115,20 +115,15 @@ lseek(int fd, off_t offset, int whence)
{
_SYSIO_OFF_T off;
off_t rtn;
- SYSIO_ENTER;
off = _sysio_lseek(fd, offset, whence);
- if (off < 0) {
- SYSIO_LEAVE;
+ if (off < 0)
return -1;
- }
rtn = (off_t )off;
if ((_SYSIO_OFF_T )rtn != off) {
errno = EINVAL;
- SYSIO_LEAVE;
return -1;
}
- SYSIO_LEAVE;
return rtn;
}
Index: mkdir.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/mkdir.c,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -w -b -B -p -r1.3.4.1 -r1.3.4.2
--- mkdir.c 29 Jun 2003 10:15:32 -0000 1.3.4.1
+++ mkdir.c 15 Dec 2003 08:22:16 -0000 1.3.4.2
@@ -58,7 +58,6 @@ mkdir(const char *path, mode_t mode)
int err;
struct intent intent;
struct pnode *pno;
- SYSIO_ENTER;
INTENT_INIT(&intent, INT_CREAT, &mode, NULL);
err = _sysio_namei(_sysio_cwd, path, ND_NEGOK, &intent, &pno);
@@ -81,7 +80,5 @@ out:
errno = -err;
err = -1;
}
-
- SYSIO_LEAVE;
return err;
}
Index: mknod.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/mknod.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
--- mknod.c 1 Nov 2003 03:08:22 -0000 1.3.4.2
+++ mknod.c 15 Dec 2003 08:22:16 -0000 1.3.4.3
@@ -114,13 +114,8 @@ out:
static int
__mknod(const char *path, mode_t mode, dev_t dev)
{
- int rc;
- SYSIO_ENTER;
- rc = __xmknod(_MKNOD_VER, path, mode, &dev);
-
- SYSIO_LEAVE;
- return rc;
+ return __xmknod(_MKNOD_VER, path, mode, &dev);
}
sysio_sym_weak_alias(__mknod, mknod)
Index: open.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/open.c,v
retrieving revision 1.7.2.6
retrieving revision 1.7.2.7
diff -u -w -b -B -p -r1.7.2.6 -r1.7.2.7
--- open.c 4 Dec 2003 04:39:17 -0000 1.7.2.6
+++ open.c 15 Dec 2003 08:22:16 -0000 1.7.2.7
@@ -130,7 +130,6 @@ open(const char *path, int flags, ...)
int err;
struct pnode *pno;
struct file *fil;
- SYSIO_ENTER;
/*
* Get mode argument and determine parameters for namei
@@ -198,7 +197,6 @@ open(const char *path, int flags, ...)
P_RELE(pno);
- SYSIO_LEAVE;
return err;
error:
@@ -207,7 +205,6 @@ error:
if (pno)
P_RELE(pno);
errno = -err;
- SYSIO_LEAVE;
return -1;
}
@@ -225,12 +222,10 @@ int
close(int fd)
{
int err;
- SYSIO_ENTER;
err = _sysio_fd_close(fd);
if (err)
errno = -err;
- SYSIO_LEAVE;
return err ? -1 : 0;
}
Index: read.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/read.c,v
retrieving revision 1.2.8.9
retrieving revision 1.2.8.10
diff -u -w -b -B -p -r1.2.8.9 -r1.2.8.10
--- read.c 4 Dec 2003 04:39:17 -0000 1.2.8.9
+++ read.c 15 Dec 2003 08:22:16 -0000 1.2.8.10
@@ -116,18 +116,14 @@ ipreadv(int fd, const struct iovec *iov,
{
struct file *fil;
struct ioctx *ioctxp;
- ioid_t rc;
- SYSIO_ENTER;
fil = _sysio_fd_find(fd);
if (!fil) {
errno = -EBADF;
- SYSIO_LEAVE;
return IOID_FAIL;
}
ioctxp = do_ixreadv(fil, iov, count, offset, NULL);
- SYSIO_LEAVE;
return ioctxp ? ioctxp->ioctx_id : IOID_FAIL;
}
@@ -197,22 +193,16 @@ ireadv(int fd, const struct iovec *iov,
{
struct file *fil;
struct ioctx *ioctxp;
- ioid_t rc;
- SYSIO_ENTER;
fil = _sysio_fd_find(fd);
if (!fil) {
errno = -EBADF;
- SYSIO_LEAVE;
return IOID_FAIL;
}
ioctxp = do_ixreadv(fil, iov, count, fil->f_pos, _sysio_fcompletio);
- if (!ioctxp) {
- SYSIO_LEAVE;
+ if (!ioctxp)
return IOID_FAIL;
- }
- SYSIO_LEAVE;
return ioctxp->ioctx_id;
}
Index: rmdir.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/rmdir.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
--- rmdir.c 1 Nov 2003 03:08:22 -0000 1.3.4.2
+++ rmdir.c 15 Dec 2003 08:22:16 -0000 1.3.4.3
@@ -58,7 +58,6 @@ rmdir(const char *path)
struct intent intent;
int err;
struct pnode *pno;
- SYSIO_ENTER;
INTENT_INIT(&intent, INT_UPDPARENT, NULL, NULL);
err = _sysio_namei(_sysio_cwd, path, 0, &intent, &pno);
@@ -83,6 +82,5 @@ out:
errno = -err;
err = -1;
}
- SYSIO_LEAVE;
return err;
}
Index: stat.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/stat.c,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -u -w -b -B -p -r1.3.4.3 -r1.3.4.4
--- stat.c 4 Dec 2003 04:39:17 -0000 1.3.4.3
+++ stat.c 15 Dec 2003 08:22:16 -0000 1.3.4.4
@@ -129,13 +129,7 @@ out:
static int
__fstat(int fd, struct stat *buf)
{
- int rc;
- SYSIO_ENTER;
-
- rc = __fxstat_internal(_STAT_VER, fd, buf);
-
- SYSIO_LEAVE;
- return rc;
+ return __fxstat_internal(_STAT_VER, fd, buf);
}
sysio_sym_weak_alias(__fstat, fstat)
@@ -191,13 +185,8 @@ out:
static int
__stat(const char *filename, struct stat *buf)
{
- int rc;
- SYSIO_ENTER;
- rc = __xstat(_STAT_VER, filename, buf);
-
- SYSIO_LEAVE;
- return rc;
+ return __xstat(_STAT_VER, filename, buf);
}
sysio_sym_weak_alias(__stat, stat)
@@ -253,13 +242,8 @@ out:
static int
__lstat(const char *filename, struct stat *buf)
{
- int rc;
- SYSIO_ENTER;
-
- rc = __lxstat(_STAT_VER, filename, buf);
- SYSIO_LEAVE;
- return rc;
+ return __lxstat(_STAT_VER, filename, buf);
}
sysio_sym_weak_alias(__lstat, lstat)
Index: stat64.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/stat64.c,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -u -w -b -B -p -r1.3.4.3 -r1.3.4.4
--- stat64.c 4 Dec 2003 04:39:17 -0000 1.3.4.3
+++ stat64.c 15 Dec 2003 08:22:16 -0000 1.3.4.4
@@ -91,13 +91,7 @@ out:
int
fstat64(int fd, struct stat64 *buf)
{
- int rc;
- SYSIO_ENTER;
-
- rc = __fxstat64_internal(_STAT_VER, fd, buf);
-
- SYSIO_LEAVE;
- return rc;
+ return __fxstat64_internal(_STAT_VER, fd, buf);
}
int
@@ -132,13 +126,8 @@ out:
int
stat64(const char *filename, struct stat64 *buf)
{
- int rc;
- SYSIO_ENTER;
- rc = __xstat64(_STAT_VER, filename, buf);
-
- SYSIO_LEAVE;
- return rc;
+ return __xstat64(_STAT_VER, filename, buf);
}
int
@@ -173,12 +162,7 @@ out:
int
lstat64(const char *filename, struct stat64 *buf)
{
- int rc;
- SYSIO_ENTER;
-
- rc = __lxstat64(_STAT_VER, filename, buf);
- SYSIO_LEAVE;
- return rc;
+ return __lxstat64(_STAT_VER, filename, buf);
}
#endif /* !_LARGEFILE64_SOURCE */
Index: statvfs.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/statvfs.c,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -u -w -b -B -p -r1.3.4.3 -r1.3.4.4
--- statvfs.c 1 Nov 2003 03:08:22 -0000 1.3.4.3
+++ statvfs.c 15 Dec 2003 08:22:16 -0000 1.3.4.4
@@ -92,7 +92,6 @@ statvfs(const char *path, struct statvfs
struct intnl_statvfs _call_buffer;
struct intnl_statvfs *_call_buf = &_call_buffer;
#endif
- SYSIO_ENTER;
err = _sysio_namei(_sysio_cwd, path, 0, NULL, &pno);
if (err)
@@ -110,7 +109,6 @@ err:
errno = -err;
err = -1;
out:
- SYSIO_LEAVE;
return err;
}
@@ -125,7 +123,6 @@ fstatvfs(int fd, struct statvfs *buf)
struct intnl_statvfs _call_buffer;
struct intnl_statvfs *_call_buf = &_call_buffer;
#endif
- SYSIO_ENTER;
err = 0;
filp = _sysio_fd_find(fd);
@@ -145,7 +142,6 @@ err:
errno = -err;
err = -1;
out:
- SYSIO_LEAVE;
return err;
}
#endif /* if !(defined(BSD) || defined(REDSTORM)) */
Index: statvfs64.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/statvfs64.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
--- statvfs64.c 1 Nov 2003 03:08:22 -0000 1.3.4.2
+++ statvfs64.c 15 Dec 2003 08:22:16 -0000 1.3.4.3
@@ -60,7 +60,6 @@ statvfs64(const char *path, struct statv
{
int err;
struct pnode *pno;
- SYSIO_ENTER;
err = _sysio_namei(_sysio_cwd, path, 0, NULL, &pno);
if (err)
@@ -73,8 +72,6 @@ out:
errno = -err;
err = -1;
}
-
- SYSIO_LEAVE;
return err;
}
@@ -83,7 +80,6 @@ fstatvfs64(int fd, struct statvfs64 *buf
{
int err;
struct file *filp;
- SYSIO_ENTER;
err = 0;
filp = _sysio_fd_find(fd);
@@ -98,8 +94,6 @@ out:
errno = -err;
err = -1;
}
-
- SYSIO_LEAVE;
return err;
}
#endif /* if !(defined(BSD) || defined(REDSTORM)) */
Index: symlink.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/symlink.c,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -w -b -B -p -r1.3.4.1 -r1.3.4.2
--- symlink.c 29 Jun 2003 10:15:32 -0000 1.3.4.1
+++ symlink.c 15 Dec 2003 08:22:16 -0000 1.3.4.2
@@ -58,7 +58,6 @@ symlink(const char *oldpath, const char
int err;
struct intent intent;
struct pnode *pno;
- SYSIO_ENTER;
INTENT_INIT(&intent, INT_CREAT, NULL, NULL);
err = _sysio_namei(_sysio_cwd, newpath, ND_NEGOK, &intent, &pno);
@@ -82,6 +81,5 @@ out:
errno = -err;
err = -1;
}
- SYSIO_LEAVE;
return err;
}
Index: truncate.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/truncate.c,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -u -w -b -B -p -r1.3.4.3 -r1.3.4.4
--- truncate.c 1 Nov 2003 03:08:23 -0000 1.3.4.3
+++ truncate.c 15 Dec 2003 08:22:16 -0000 1.3.4.4
@@ -84,7 +84,6 @@ _truncate(const char *path, _SYSIO_OFF_T
{
int err;
struct pnode *pno;
- SYSIO_ENTER;
err = _sysio_namei(_sysio_cwd, path, 0, NULL, &pno);
if (err)
@@ -97,7 +96,6 @@ out:
errno = -err;
err = -1;
}
- SYSIO_LEAVE;
return err;
}
@@ -122,7 +120,6 @@ _ftruncate(int fd, _SYSIO_OFF_T length)
{
int err;
struct file *fil;
- SYSIO_ENTER;
err = 0;
fil = _sysio_fd_find(fd);
@@ -136,7 +133,6 @@ out:
errno = -err;
err = -1;
}
- SYSIO_LEAVE;
return err;
}
Index: unlink.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/unlink.c,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -u -w -b -B -p -r1.3.4.3 -r1.3.4.4
--- unlink.c 1 Nov 2003 03:08:23 -0000 1.3.4.3
+++ unlink.c 15 Dec 2003 08:22:16 -0000 1.3.4.4
@@ -58,7 +58,6 @@ unlink(const char *path)
struct intent intent;
int err;
struct pnode *pno;
- SYSIO_ENTER;
INTENT_INIT(&intent, INT_UPDPARENT, NULL, NULL);
err = _sysio_namei(_sysio_cwd, path, ND_NOFOLLOW, &intent, &pno);
@@ -83,6 +82,5 @@ out:
errno = -err;
err = -1;
}
- SYSIO_LEAVE;
return err;
}
Index: write.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/write.c,v
retrieving revision 1.2.10.9
retrieving revision 1.2.10.10
diff -u -w -b -B -p -r1.2.10.9 -r1.2.10.10
--- write.c 4 Dec 2003 04:39:17 -0000 1.2.10.9
+++ write.c 15 Dec 2003 08:22:16 -0000 1.2.10.10
@@ -115,18 +115,14 @@ ipwritev(int fd, const struct iovec *iov
{
struct file *fil;
struct ioctx *ioctxp;
- ioid_t rc;
- SYSIO_ENTER;
fil = _sysio_fd_find(fd);
if (!fil) {
errno = -EBADF;
- SYSIO_LEAVE;
return IOID_FAIL;
}
ioctxp = do_ixwritev(fil, iov, count, offset, NULL);
- SYSIO_LEAVE;
return ioctxp ? ioctxp->ioctx_id : IOID_FAIL;
}
@@ -195,22 +192,16 @@ iwritev(int fd, const struct iovec *iov,
{
struct file *fil;
struct ioctx *ioctxp;
- ioid_t rc;
- SYSIO_ENTER;
fil = _sysio_fd_find(fd);
if (!fil) {
errno = -EBADF;
- SYSIO_LEAVE;
return IOID_FAIL;
}
ioctxp = do_ixwritev(fil, iov, count, fil->f_pos, _sysio_fcompletio);
- if (!ioctxp) {
- SYSIO_LEAVE;
+ if (!ioctxp)
return IOID_FAIL;
- }
- SYSIO_LEAVE;
return ioctxp->ioctx_id;
}
|
