Author: dchagin
Date: Fri Feb 24 19:47:27 2017
New Revision: 314218
URL: https://svnweb.freebsd.org/changeset/base/314218
Log:
Revert r314217. Commit is not match that I have approved.
Modified:
head/sys/amd64/linux/linux_dummy.c
head/sys/amd64/linux32/linux32_dummy.c
head/sys/amd64/linux32/linux32_machdep.c
head/sys/compat/linux/linux_file.c
head/sys/i386/linux/linux_dummy.c
Modified: head/sys/amd64/linux/linux_dummy.c
==============================================================================
--- head/sys/amd64/linux/linux_dummy.c Fri Feb 24 19:22:17 2017
(r314217)
+++ head/sys/amd64/linux/linux_dummy.c Fri Feb 24 19:47:27 2017
(r314218)
@@ -110,6 +110,9 @@ DUMMY(timerfd_gettime);
/* linux 2.6.27: */
DUMMY(signalfd4);
DUMMY(inotify_init1);
+/* linux 2.6.30: */
+DUMMY(preadv);
+DUMMY(pwritev);
/* linux 2.6.31: */
DUMMY(perf_event_open);
/* linux 2.6.38: */
Modified: head/sys/amd64/linux32/linux32_dummy.c
==============================================================================
--- head/sys/amd64/linux32/linux32_dummy.c Fri Feb 24 19:22:17 2017
(r314217)
+++ head/sys/amd64/linux32/linux32_dummy.c Fri Feb 24 19:47:27 2017
(r314218)
@@ -110,6 +110,9 @@ DUMMY(timerfd_gettime);
/* linux 2.6.27: */
DUMMY(signalfd4);
DUMMY(inotify_init1);
+/* linux 2.6.30: */
+DUMMY(preadv);
+DUMMY(pwritev);
/* linux 2.6.31: */
DUMMY(perf_event_open);
/* linux 2.6.33: */
Modified: head/sys/amd64/linux32/linux32_machdep.c
==============================================================================
--- head/sys/amd64/linux32/linux32_machdep.c Fri Feb 24 19:22:17 2017
(r314217)
+++ head/sys/amd64/linux32/linux32_machdep.c Fri Feb 24 19:47:27 2017
(r314218)
@@ -241,52 +241,6 @@ linux_writev(struct thread *td, struct l
return (error);
}
-int
-linux_preadv(struct thread *td, struct linux_preadv_args *uap)
-{
- struct uio *auio;
- int error;
- off_t offset;
-
- error = linux32_copyinuio((struct l_iovec32 *)uap->vec,
- uap->vlen, &auio);
- if (error)
- return (error);
- /*
- * According http://man7.org/linux/man-pages/man2/preadv.2.html#NOTES
- * pos_l and pos_h, respectively, contain the
- * low order and high order 32 bits of offset.
- */
- offset = (((off_t)uap->pos_h << (sizeof(offset) * 4)) <<
- (sizeof(offset) * 4)) | uap->pos_l;
- error = kern_preadv(td, uap->fd, auio, offset);
- free(auio, M_IOV);
- return (error);
-}
-
-int
-linux_pwritev(struct thread *td, struct linux_pwritev_args *uap)
-{
- struct uio *auio;
- int error;
- off_t offset;
-
- error = linux32_copyinuio((struct l_iovec32 *)uap->vec,
- uap->vlen, &auio);
- if (error)
- return (error);
- /*
- * According http://man7.org/linux/man-pages/man2/pwritev.2.html#NOTES
- * pos_l and pos_h, respectively, contain the
- * low order and high order 32 bits of offset.
- */
- offset = (((off_t)uap->pos_h << (sizeof(offset) * 4)) <<
- (sizeof(offset) * 4)) | uap->pos_l;
- error = kern_pwritev(td, uap->fd, auio, offset);
- free(auio, M_IOV);
- return (error);
-}
-
struct l_ipc_kludge {
l_uintptr_t msgp;
l_long msgtyp;
Modified: head/sys/compat/linux/linux_file.c
==============================================================================
--- head/sys/compat/linux/linux_file.c Fri Feb 24 19:22:17 2017
(r314217)
+++ head/sys/compat/linux/linux_file.c Fri Feb 24 19:47:27 2017
(r314218)
@@ -1027,52 +1027,6 @@ linux_pwrite(struct thread *td, struct l
return (kern_pwrite(td, uap->fd, uap->buf, uap->nbyte, uap->offset));
}
-#if !(defined(__amd64__) && defined(COMPAT_LINUX32))
-int
-linux_preadv(struct thread *td, struct linux_preadv_args *uap)
-{
- struct uio *auio;
- int error;
- off_t offset;
-
- error = copyinuio(uap->vec, uap->vlen, &auio);
- if (error)
- return (error);
- /*
- * According http://man7.org/linux/man-pages/man2/preadv.2.html#NOTES
- * pos_l and pos_h, respectively, contain the
- * low order and high order 32 bits of offset.
- */
- offset = (((off_t)uap->pos_h << (sizeof(offset) * 4)) <<
- (sizeof(offset) * 4)) | uap->pos_l;
- error = kern_preadv(td, uap->fd, auio, offset);
- free(auio, M_IOV);
- return (error);
-}
-
-int
-linux_pwritev(struct thread *td, struct linux_pwritev_args *uap)
-{
- struct uio *auio;
- int error;
- off_t offset;
-
- error = copyinuio(uap->vec, uap->vlen, &auio);
- if (error)
- return (error);
- /*
- * According http://man7.org/linux/man-pages/man2/pwritev.2.html#NOTES
- * pos_l and pos_h, respectively, contain the
- * low order and high order 32 bits of offset.
- */
- offset = (((off_t)uap->pos_h << (sizeof(offset) * 4)) <<
- (sizeof(offset) * 4)) | uap->pos_l;
- error = kern_pwritev(td, uap->fd, auio, offset);
- free(auio, M_IOV);
- return (error);
-}
-#endif /* !(__amd64__ && COMPAT_LINUX32) */
-
int
linux_mount(struct thread *td, struct linux_mount_args *args)
{
Modified: head/sys/i386/linux/linux_dummy.c
==============================================================================
--- head/sys/i386/linux/linux_dummy.c Fri Feb 24 19:22:17 2017
(r314217)
+++ head/sys/i386/linux/linux_dummy.c Fri Feb 24 19:47:27 2017
(r314218)
@@ -106,6 +106,9 @@ DUMMY(timerfd_gettime);
/* linux 2.6.27: */
DUMMY(signalfd4);
DUMMY(inotify_init1);
+/* linux 2.6.30: */
+DUMMY(preadv);
+DUMMY(pwritev);
/* linux 2.6.31: */
DUMMY(perf_event_open);
/* linux 2.6.33: */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
