svn commit: r297061 - in head/sys: amd64/linux32 compat/linux i386/linux

[Dmitry Chagin]

Author: dchagin
Date: Sun Mar 20 13:21:20 2016
New Revision: 297061
URL: https://svnweb.freebsd.org/changeset/base/297061

Log:
  Implement fstatfs64 system call.
  
  PR:		181012
  Submitted by:	John Wehle
  MFC after:	1 week

Modified:
  head/sys/amd64/linux32/linux32_dummy.c
  head/sys/amd64/linux32/syscalls.master
  head/sys/compat/linux/linux_stats.c
  head/sys/i386/linux/linux_dummy.c
  head/sys/i386/linux/syscalls.master

Modified: head/sys/amd64/linux32/linux32_dummy.c
==============================================================================
--- head/sys/amd64/linux32/linux32_dummy.c	Sun Mar 20 11:40:52 2016	(r297060)
+++ head/sys/amd64/linux32/linux32_dummy.c	Sun Mar 20 13:21:20 2016	(r297061)
@@ -69,7 +69,6 @@ DUMMY(mincore);
 DUMMY(ptrace);
 DUMMY(lookup_dcookie);
 DUMMY(remap_file_pages);
-DUMMY(fstatfs64);
 DUMMY(mbind);
 DUMMY(get_mempolicy);
 DUMMY(set_mempolicy);

Modified: head/sys/amd64/linux32/syscalls.master
==============================================================================
--- head/sys/amd64/linux32/syscalls.master	Sun Mar 20 11:40:52 2016	(r297060)
+++ head/sys/amd64/linux32/syscalls.master	Sun Mar 20 13:21:20 2016	(r297061)
@@ -450,7 +450,7 @@
 267	AUE_NULL	STD	{ int linux_clock_nanosleep(clockid_t which, int flags, \
 					struct l_timespec *rqtp, struct l_timespec *rmtp); }
 268	AUE_STATFS	STD	{ int linux_statfs64(char *path, size_t bufsize, struct l_statfs64_buf *buf); }
-269	AUE_FSTATFS	STD	{ int linux_fstatfs64(void); }
+269	AUE_FSTATFS	STD	{ int linux_fstatfs64(l_uint fd, size_t bufsize, struct l_statfs64_buf *buf); }
 270	AUE_NULL	STD	{ int linux_tgkill(int tgid, int pid, int sig); }
 271	AUE_UTIMES	STD	{ int linux_utimes(char *fname, \
 					struct l_timeval *tptr); }

Modified: head/sys/compat/linux/linux_stats.c
==============================================================================
--- head/sys/compat/linux/linux_stats.c	Sun Mar 20 11:40:52 2016	(r297060)
+++ head/sys/compat/linux/linux_stats.c	Sun Mar 20 13:21:20 2016	(r297061)
@@ -460,6 +460,27 @@ linux_statfs64(struct thread *td, struct
 	bsd_to_linux_statfs64(&bsd_statfs, &linux_statfs);
 	return copyout(&linux_statfs, args->buf, sizeof(linux_statfs));
 }
+
+int
+linux_fstatfs64(struct thread *td, struct linux_fstatfs64_args *args)
+{
+	struct l_statfs64 linux_statfs;
+	struct statfs bsd_statfs;
+	int error;
+
+#ifdef DEBUG
+	if (ldebug(fstatfs64))
+		printf(ARGS(fstatfs64, "%d, *"), args->fd);
+#endif
+	if (args->bufsize != sizeof(struct l_statfs64))
+		return (EINVAL);
+
+	error = kern_fstatfs(td, args->fd, &bsd_statfs);
+	if (error)
+		return error;
+	bsd_to_linux_statfs64(&bsd_statfs, &linux_statfs);
+	return (copyout(&linux_statfs, args->buf, sizeof(linux_statfs)));
+}
 #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */
 
 int

Modified: head/sys/i386/linux/linux_dummy.c
==============================================================================
--- head/sys/i386/linux/linux_dummy.c	Sun Mar 20 11:40:52 2016	(r297060)
+++ head/sys/i386/linux/linux_dummy.c	Sun Mar 20 13:21:20 2016	(r297061)
@@ -71,7 +71,6 @@ DUMMY(pivot_root);
 DUMMY(mincore);
 DUMMY(lookup_dcookie);
 DUMMY(remap_file_pages);
-DUMMY(fstatfs64);
 DUMMY(mbind);
 DUMMY(get_mempolicy);
 DUMMY(set_mempolicy);

Modified: head/sys/i386/linux/syscalls.master
==============================================================================
--- head/sys/i386/linux/syscalls.master	Sun Mar 20 11:40:52 2016	(r297060)
+++ head/sys/i386/linux/syscalls.master	Sun Mar 20 13:21:20 2016	(r297061)
@@ -452,7 +452,7 @@
 267	AUE_NULL	STD	{ int linux_clock_nanosleep(clockid_t which, int flags, \
 					struct l_timespec *rqtp, struct l_timespec *rmtp); }
 268	AUE_STATFS	STD	{ int linux_statfs64(char *path, size_t bufsize, struct l_statfs64_buf *buf); }
-269	AUE_FSTATFS	STD	{ int linux_fstatfs64(void); }
+269	AUE_FSTATFS	STD	{ int linux_fstatfs64(l_uint fd, size_t bufsize, struct l_statfs64_buf *buf); }
 270	AUE_NULL	STD	{ int linux_tgkill(int tgid, int pid, int sig); }
 271	AUE_UTIMES	STD	{ int linux_utimes(char *fname, \
 					struct l_timeval *tptr); }