Revert r314217. Commit is not match that I have approved.

5 files changed, 9 insertions, 92 deletions

diff --git a/sys/amd64/linux/linux_dummy.c b/sys/amd64/linux/linux_dummy.c
index 8045023213ba..690205a0e6cc 100644
--- a/sys/amd64/linux/linux_dummy.c
+++ b/sys/amd64/linux/linux_dummy.c
@@ -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: */
diff --git a/sys/amd64/linux32/linux32_dummy.c b/sys/amd64/linux32/linux32_dummy.c
index 8a59859c36f1..9ba578c47e0e 100644
--- a/sys/amd64/linux32/linux32_dummy.c
+++ b/sys/amd64/linux32/linux32_dummy.c
@@ -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: */
diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c
index 88bb36d247db..5b66d2f90fdf 100644
--- a/sys/amd64/linux32/linux32_machdep.c
+++ b/sys/amd64/linux32/linux32_machdep.c
@@ -241,52 +241,6 @@ linux_writev(struct thread *td, struct linux_writev_args *uap)
 	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;
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index 4a430676899b..a7695f010cee 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -1027,52 +1027,6 @@ linux_pwrite(struct thread *td, struct linux_pwrite_args *uap)
 	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)
 {
diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c
index 06145c0dde53..65f80c6f10be 100644
--- a/sys/i386/linux/linux_dummy.c
+++ b/sys/i386/linux/linux_dummy.c
@@ -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: */