svn commit: r313016 - in head/sys: compat/freebsd32 kern

[Edward Tomasz Napierala]

Author: trasz
Date: Tue Jan 31 15:19:44 2017
New Revision: 313016
URL: https://svnweb.freebsd.org/changeset/base/313016

Log:
  Replace calls to sys_truncate() with kern_truncate().
  
  Reviewed by:	kib@
  MFC after:	2 weeks
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D9371

Modified:
  head/sys/compat/freebsd32/freebsd32_misc.c
  head/sys/kern/vfs_syscalls.c

Modified: head/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_misc.c	Tue Jan 31 15:11:23 2017	(r313015)
+++ head/sys/compat/freebsd32/freebsd32_misc.c	Tue Jan 31 15:19:44 2017	(r313016)
@@ -1500,11 +1500,9 @@ freebsd32_lseek(struct thread *td, struc
 int
 freebsd32_truncate(struct thread *td, struct freebsd32_truncate_args *uap)
 {
-	struct truncate_args ap;
 
-	ap.path = uap->path;
-	ap.length = PAIR32TO64(off_t,uap->length);
-	return (sys_truncate(td, &ap));
+	return (kern_truncate(td, uap->path, UIO_USERSPACE,
+	    PAIR32TO64(off_t, uap->length)));
 }
 
 int
@@ -1600,11 +1598,9 @@ freebsd6_freebsd32_lseek(struct thread *
 int
 freebsd6_freebsd32_truncate(struct thread *td, struct freebsd6_freebsd32_truncate_args *uap)
 {
-	struct truncate_args ap;
 
-	ap.path = uap->path;
-	ap.length = PAIR32TO64(off_t,uap->length);
-	return (sys_truncate(td, &ap));
+	return (kern_truncate(td, uap->path, UIO_USERSPACE,
+	    PAIR32TO64(off_t, uap->length)));
 }
 
 int

Modified: head/sys/kern/vfs_syscalls.c
==============================================================================
--- head/sys/kern/vfs_syscalls.c	Tue Jan 31 15:11:23 2017	(r313015)
+++ head/sys/kern/vfs_syscalls.c	Tue Jan 31 15:19:44 2017	(r313016)
@@ -3310,22 +3310,10 @@ struct otruncate_args {
 };
 #endif
 int
-otruncate(td, uap)
-	struct thread *td;
-	register struct otruncate_args /* {
-		char *path;
-		long length;
-	} */ *uap;
+otruncate(struct thread *td, struct otruncate_args *uap)
 {
-	struct truncate_args /* {
-		char *path;
-		int pad;
-		off_t length;
-	} */ nuap;
-
-	nuap.path = uap->path;
-	nuap.length = uap->length;
-	return (sys_truncate(td, &nuap));
+
+	return (kern_truncate(td, uap->path, UIO_USERSPACE, uap->length));
 }
 #endif /* COMPAT_43 */
 
@@ -3334,11 +3322,8 @@ otruncate(td, uap)
 int
 freebsd6_truncate(struct thread *td, struct freebsd6_truncate_args *uap)
 {
-	struct truncate_args ouap;
 
-	ouap.path = uap->path;
-	ouap.length = uap->length;
-	return (sys_truncate(td, &ouap));
+	return (kern_truncate(td, uap->path, UIO_USERSPACE, uap->length));
 }
 
 int