Author: dchagin
Date: Sun Mar 27 06:10:51 2016
New Revision: 297300
URL: https://svnweb.freebsd.org/changeset/base/297300
Log:
MFC r297061;
Implement fstatfs64 system call.
PR: 181012
Submitted by: John Wehle
Modified:
stable/10/sys/amd64/linux32/linux32_dummy.c
stable/10/sys/amd64/linux32/syscalls.master
stable/10/sys/compat/linux/linux_stats.c
stable/10/sys/i386/linux/linux_dummy.c
stable/10/sys/i386/linux/syscalls.master
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/amd64/linux32/linux32_dummy.c
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_dummy.c Sun Mar 27 00:37:54 2016
(r297299)
+++ stable/10/sys/amd64/linux32/linux32_dummy.c Sun Mar 27 06:10:51 2016
(r297300)
@@ -70,7 +70,6 @@ DUMMY(mincore);
DUMMY(ptrace);
DUMMY(lookup_dcookie);
DUMMY(remap_file_pages);
-DUMMY(fstatfs64);
DUMMY(mbind);
DUMMY(get_mempolicy);
DUMMY(set_mempolicy);
Modified: stable/10/sys/amd64/linux32/syscalls.master
==============================================================================
--- stable/10/sys/amd64/linux32/syscalls.master Sun Mar 27 00:37:54 2016
(r297299)
+++ stable/10/sys/amd64/linux32/syscalls.master Sun Mar 27 06:10:51 2016
(r297300)
@@ -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: stable/10/sys/compat/linux/linux_stats.c
==============================================================================
--- stable/10/sys/compat/linux/linux_stats.c Sun Mar 27 00:37:54 2016
(r297299)
+++ stable/10/sys/compat/linux/linux_stats.c Sun Mar 27 06:10:51 2016
(r297300)
@@ -459,6 +459,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: stable/10/sys/i386/linux/linux_dummy.c
==============================================================================
--- stable/10/sys/i386/linux/linux_dummy.c Sun Mar 27 00:37:54 2016
(r297299)
+++ stable/10/sys/i386/linux/linux_dummy.c Sun Mar 27 06:10:51 2016
(r297300)
@@ -72,7 +72,6 @@ DUMMY(pivot_root);
DUMMY(mincore);
DUMMY(lookup_dcookie);
DUMMY(remap_file_pages);
-DUMMY(fstatfs64);
DUMMY(mbind);
DUMMY(get_mempolicy);
DUMMY(set_mempolicy);
Modified: stable/10/sys/i386/linux/syscalls.master
==============================================================================
--- stable/10/sys/i386/linux/syscalls.master Sun Mar 27 00:37:54 2016
(r297299)
+++ stable/10/sys/i386/linux/syscalls.master Sun Mar 27 06:10:51 2016
(r297300)
@@ -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); }
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
