Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[fs/lustre-release.git]
/
libsysio
/
src
/
dup.c
diff --git
a/libsysio/src/dup.c
b/libsysio/src/dup.c
index
9226a5a
..
ba3d24c
100644
(file)
--- a/
libsysio/src/dup.c
+++ b/
libsysio/src/dup.c
@@
-59,17
+59,7
@@
SYSIO_INTERFACE_NAME(dup2)(int oldfd, int newfd)
SYSIO_INTERFACE_ENTER;
if (newfd < 0)
SYSIO_INTERFACE_RETURN(-1, -EBADF);
SYSIO_INTERFACE_ENTER;
if (newfd < 0)
SYSIO_INTERFACE_RETURN(-1, -EBADF);
-
- if (oldfd == newfd) {
- struct file *fil;
-
- fil = _sysio_fd_find(oldfd);
- if (!(fil && fil->f_ino))
- SYSIO_INTERFACE_RETURN(-1, -EBADF);
- SYSIO_INTERFACE_RETURN(newfd, 0);
- }
-
- fd = _sysio_fd_dup2(oldfd, newfd);
+ fd = _sysio_fd_dup(oldfd, newfd, 1);
SYSIO_INTERFACE_RETURN(fd < 0 ? -1 : fd, fd < 0 ? fd : 0);
}
SYSIO_INTERFACE_RETURN(fd < 0 ? -1 : fd, fd < 0 ? fd : 0);
}
@@
-86,7
+76,7
@@
SYSIO_INTERFACE_NAME(dup)(int oldfd)
SYSIO_INTERFACE_DISPLAY_BLOCK;
SYSIO_INTERFACE_ENTER;
SYSIO_INTERFACE_DISPLAY_BLOCK;
SYSIO_INTERFACE_ENTER;
- fd = _sysio_fd_dup
2(oldfd, -1
);
+ fd = _sysio_fd_dup
(oldfd, -1, 0
);
SYSIO_INTERFACE_RETURN(fd < 0 ? -1 : fd, fd < 0 ? fd : 0);
}
SYSIO_INTERFACE_RETURN(fd < 0 ? -1 : fd, fd < 0 ? fd : 0);
}