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
use one place for syscall.h
[fs/lustre-release.git]
/
libsysio
/
src
/
rw.c
diff --git
a/libsysio/src/rw.c
b/libsysio/src/rw.c
index
e482379
..
300f073
100644
(file)
--- a/
libsysio/src/rw.c
+++ b/
libsysio/src/rw.c
@@
-105,9
+105,7
@@
_sysio_iiox(int (*f)(struct inode *, struct ioctx *),
/*
* Check that it was opened with flags supporting the operation.
*/
/*
* Check that it was opened with flags supporting the operation.
*/
- if (!(wr
- ? (fil->f_flags & (O_RDWR | O_WRONLY))
- : !(fil->f_flags & O_WRONLY)))
+ if (!F_CHKRW(fil, wr ? 'w' : 'r'))
return -EBADF;
ino = fil->f_ino;
return -EBADF;
ino = fil->f_ino;
@@
-120,7
+118,7
@@
_sysio_iiox(int (*f)(struct inode *, struct ioctx *),
cc =
_sysio_validx(xtv, xtv_count,
iov, iov_count,
cc =
_sysio_validx(xtv, xtv_count,
iov, iov_count,
-#if
_LARGEFILE64_SOURCE
&& defined(O_LARGEFILE)
+#if
defined(_LARGEFILE64_SOURCE)
&& defined(O_LARGEFILE)
(fil->f_flags & O_LARGEFILE) == 0
? LONG_MAX
:
(fil->f_flags & O_LARGEFILE) == 0
? LONG_MAX
:
@@
-467,7
+465,7
@@
PREPEND(_, SYSIO_INTERFACE_NAME(ipreadv))(int fd,
SYSIO_INTERFACE_RETURN(ioctx, 0);
}
SYSIO_INTERFACE_RETURN(ioctx, 0);
}
-#if _LARGEFILE64_SOURCE
+#if
def
_LARGEFILE64_SOURCE
#undef ipread64v
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(ipreadv)),
SYSIO_INTERFACE_NAME(ipread64v))
#undef ipread64v
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(ipreadv)),
SYSIO_INTERFACE_NAME(ipread64v))
@@
-517,7
+515,7
@@
PREPEND(_, SYSIO_INTERFACE_NAME(preadv))(int fd,
SYSIO_INTERFACE_RETURN(err ? -1 : cc, err);
}
SYSIO_INTERFACE_RETURN(err ? -1 : cc, err);
}
-#if _LARGEFILE64_SOURCE
+#if
def
_LARGEFILE64_SOURCE
#undef pread64v
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(preadv)),
SYSIO_INTERFACE_NAME(pread64v))
#undef pread64v
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(preadv)),
SYSIO_INTERFACE_NAME(pread64v))
@@
-581,7
+579,7
@@
error:
SYSIO_INTERFACE_RETURN(ioctx, 0);
}
SYSIO_INTERFACE_RETURN(ioctx, 0);
}
-#if _LARGEFILE64_SOURCE
+#if
def
_LARGEFILE64_SOURCE
#undef ipread64
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(ipread)),
SYSIO_INTERFACE_NAME(ipread64))
#undef ipread64
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(ipread)),
SYSIO_INTERFACE_NAME(ipread64))
@@
-635,7
+633,7
@@
PREPEND(_, SYSIO_INTERFACE_NAME(pread))(int fd,
SYSIO_INTERFACE_RETURN(err ? -1 : cc, err);
}
SYSIO_INTERFACE_RETURN(err ? -1 : cc, err);
}
-#if _LARGEFILE64_SOURCE
+#if
def
_LARGEFILE64_SOURCE
#undef pread64
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(pread)),
SYSIO_INTERFACE_NAME(pread64))
#undef pread64
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(pread)),
SYSIO_INTERFACE_NAME(pread64))
@@
-700,13
+698,13
@@
PREPEND(_, SYSIO_INTERFACE_NAME(ireadx))(int fd,
SYSIO_INTERFACE_RETURN(err ? IOID_FAIL : ioctx, err);
}
SYSIO_INTERFACE_RETURN(err ? IOID_FAIL : ioctx, err);
}
-#if _LARGEFILE64_SOURCE
+#if
def
_LARGEFILE64_SOURCE
#undef iread64x
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(ireadx)),
SYSIO_INTERFACE_NAME(iread64x))
#endif
#undef iread64x
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(ireadx)),
SYSIO_INTERFACE_NAME(iread64x))
#endif
-#if _LARGEFILE64_SOURCE
+#if
def
_LARGEFILE64_SOURCE
ioid_t
SYSIO_INTERFACE_NAME(ireadx)(int fd,
const struct iovec *iov, size_t iov_count,
ioid_t
SYSIO_INTERFACE_NAME(ireadx)(int fd,
const struct iovec *iov, size_t iov_count,
@@
-776,7
+774,7
@@
SYSIO_INTERFACE_NAME(readx)(int fd,
return SYSIO_INTERFACE_NAME(iowait)(ioid);
}
return SYSIO_INTERFACE_NAME(iowait)(ioid);
}
-#if _LARGEFILE64_SOURCE
+#if
def
_LARGEFILE64_SOURCE
#undef iread64x
ssize_t
SYSIO_INTERFACE_NAME(read64x)(int fd,
#undef iread64x
ssize_t
SYSIO_INTERFACE_NAME(read64x)(int fd,
@@
-995,7
+993,7
@@
PREPEND(_, SYSIO_INTERFACE_NAME(ipwritev))(int fd,
SYSIO_INTERFACE_RETURN(ioctx, 0);
}
SYSIO_INTERFACE_RETURN(ioctx, 0);
}
-#if _LARGEFILE64_SOURCE
+#if
def
_LARGEFILE64_SOURCE
#undef ipwrite64v
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(ipwritev)),
SYSIO_INTERFACE_NAME(ipwrite64v))
#undef ipwrite64v
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(ipwritev)),
SYSIO_INTERFACE_NAME(ipwrite64v))
@@
-1045,7
+1043,7
@@
PREPEND(_, SYSIO_INTERFACE_NAME(pwritev))(int fd,
SYSIO_INTERFACE_RETURN(err ? -1 : cc, err);
}
SYSIO_INTERFACE_RETURN(err ? -1 : cc, err);
}
-#if _LARGEFILE64_SOURCE
+#if
def
_LARGEFILE64_SOURCE
#undef pwrite64v
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(pwritev)),
SYSIO_INTERFACE_NAME(pwrite64v))
#undef pwrite64v
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(pwritev)),
SYSIO_INTERFACE_NAME(pwrite64v))
@@
-1109,7
+1107,7
@@
error:
SYSIO_INTERFACE_RETURN(ioctx, 0);
}
SYSIO_INTERFACE_RETURN(ioctx, 0);
}
-#if _LARGEFILE64_SOURCE
+#if
def
_LARGEFILE64_SOURCE
#undef ipwrite64
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(ipwrite)),
SYSIO_INTERFACE_NAME(ipwrite64))
#undef ipwrite64
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(ipwrite)),
SYSIO_INTERFACE_NAME(ipwrite64))
@@
-1163,7
+1161,7
@@
PREPEND(_, SYSIO_INTERFACE_NAME(pwrite))(int fd,
SYSIO_INTERFACE_RETURN(err ? -1 : cc, err);
}
SYSIO_INTERFACE_RETURN(err ? -1 : cc, err);
}
-#if _LARGEFILE64_SOURCE
+#if
def
_LARGEFILE64_SOURCE
#undef pwrite64
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(pwrite)),
SYSIO_INTERFACE_NAME(pwrite64))
#undef pwrite64
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(pwrite)),
SYSIO_INTERFACE_NAME(pwrite64))
@@
-1224,13
+1222,13
@@
PREPEND(_, SYSIO_INTERFACE_NAME(iwritex))(int fd,
SYSIO_INTERFACE_RETURN(err ? IOID_FAIL : ioctx, err);
}
SYSIO_INTERFACE_RETURN(err ? IOID_FAIL : ioctx, err);
}
-#if _LARGEFILE64_SOURCE
+#if
def
_LARGEFILE64_SOURCE
#undef iwrite64x
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(iwritex)),
SYSIO_INTERFACE_NAME(iwrite64x))
#endif
#undef iwrite64x
sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(iwritex)),
SYSIO_INTERFACE_NAME(iwrite64x))
#endif
-#if _LARGEFILE64_SOURCE
+#if
def
_LARGEFILE64_SOURCE
ioid_t
SYSIO_INTERFACE_NAME(iwritex)(int fd,
const struct iovec *iov, size_t iov_count,
ioid_t
SYSIO_INTERFACE_NAME(iwritex)(int fd,
const struct iovec *iov, size_t iov_count,
@@
-1301,7
+1299,7
@@
SYSIO_INTERFACE_NAME(writex)(int fd,
return SYSIO_INTERFACE_NAME(iowait)(ioid);
}
return SYSIO_INTERFACE_NAME(iowait)(ioid);
}
-#if _LARGEFILE64_SOURCE
+#if
def
_LARGEFILE64_SOURCE
#undef write64x
ssize_t
SYSIO_INTERFACE_NAME(write64x)(int fd,
#undef write64x
ssize_t
SYSIO_INTERFACE_NAME(write64x)(int fd,